t/t4211/history.export

   1 blob
   2 mark :1
   3 data 157
   4 #include <stdio.h>
   5
   6 int f(int x)
   7 {
   8         int s = 0;
   9         while (x) {
  10                 x >>= 1;
  11                 s++;
  12         }
  13 }
  14
  15 /*
  16  * A comment.
  17  */
  18
  19 int main ()
  20 {
  21         printf("%d\n", f(15));
  22         return 0;
  23 }
  24
  25 reset refs/tags/simple
  26 commit refs/tags/simple
  27 mark :2
  28 author Thomas Rast <trast@student.ethz.ch> 1362044688 +0100
  29 committer Thomas Rast <trast@student.ethz.ch> 1362044688 +0100
  30 data 8
  31 initial
  32 M 100644 :1 a.c
  33
  34 blob
  35 mark :3
  36 data 168
  37 #include <stdio.h>
  38
  39 int f(int x)
  40 {
  41         int s = 0;
  42         while (x) {
  43                 x >>= 1;
  44                 s++;
  45         }
  46         return s;
  47 }
  48
  49 /*
  50  * A comment.
  51  */
  52
  53 int main ()
  54 {
  55         printf("%d\n", f(15));
  56         return 0;
  57 }
  58
  59 commit refs/tags/simple
  60 mark :4
  61 author Thomas Rast <trast@student.ethz.ch> 1362044695 +0100
  62 committer Thomas Rast <trast@student.ethz.ch> 1362044695 +0100
  63 data 11
  64 change f()
  65 from :2
  66 M 100644 :3 a.c
  67
  68 blob
  69 mark :5
  70 data 171
  71 #include <stdio.h>
  72
  73 long f(long x)
  74 {
  75         int s = 0;
  76         while (x) {
  77                 x >>= 1;
  78                 s++;
  79         }
  80         return s;
  81 }
  82
  83 /*
  84  * A comment.
  85  */
  86
  87 int main ()
  88 {
  89         printf("%ld\n", f(15));
  90         return 0;
  91 }
  92
  93 commit refs/tags/simple
  94 mark :6
  95 author Thomas Rast <trast@student.ethz.ch> 1362044716 +0100
  96 committer Thomas Rast <trast@student.ethz.ch> 1362044716 +0100
  97 data 21
  98 touch both functions
  99 from :4
 100 M 100644 :5 a.c
 101
 102 blob
 103 mark :7
 104 data 185
 105 #include <stdio.h>
 106
 107 long f(long x)
 108 {
 109         int s = 0;
 110         while (x) {
 111                 x >>= 1;
 112                 s++;
 113         }
 114         return s;
 115 }
 116
 117 /*
 118  * This is only an example!
 119  */
 120
 121 int main ()
 122 {
 123         printf("%ld\n", f(15));
 124         return 0;
 125 }
 126
 127 commit refs/tags/simple
 128 mark :8
 129 author Thomas Rast <trast@student.ethz.ch> 1362044741 +0100
 130 committer Thomas Rast <trast@student.ethz.ch> 1362044741 +0100
 131 data 14
 132 touch comment
 133 from :6
 134 M 100644 :7 a.c
 135
 136 blob
 137 mark :9
 138 data 205
 139 #include <unistd.h>
 140 #include <stdio.h>
 141
 142 long f(long x)
 143 {
 144         int s = 0;
 145         while (x) {
 146                 x >>= 1;
 147                 s++;
 148         }
 149         return s;
 150 }
 151
 152 /*
 153  * This is only an example!
 154  */
 155
 156 int main ()
 157 {
 158         printf("%ld\n", f(15));
 159         return 0;
 160 }
 161
 162 commit refs/tags/simple
 163 mark :10
 164 author Thomas Rast <trast@student.ethz.ch> 1362044860 +0100
 165 committer Thomas Rast <trast@student.ethz.ch> 1362044860 +0100
 166 data 25
 167 change at very beginning
 168 from :8
 169 M 100644 :9 a.c
 170
 171 blob
 172 mark :11
 173 data 204
 174 #include <unistd.h>
 175 #include <stdio.h>
 176
 177 long f(long x)
 178 {
 179         int s = 0;
 180         while (x) {
 181                 x >>= 1;
 182                 s++;
 183         }
 184         return s;
 185 }
 186
 187 /*
 188  * This is only an example!
 189  */
 190
 191 int main ()
 192 {
 193         printf("%ld\n", f(15));
 194         return 0;
 195 }
 196 commit refs/tags/simple
 197 mark :12
 198 author Thomas Rast <trast@student.ethz.ch> 1362044890 +0100
 199 committer Thomas Rast <trast@student.ethz.ch> 1362044890 +0100
 200 data 36
 201 change to an incomplete line at end
 202 from :10
 203 M 100644 :11 a.c
 204
 205 blob
 206 mark :13
 207 data 238
 208 #include <unistd.h>
 209 #include <stdio.h>
 210
 211 long f(long x)
 212 {
 213         int s = 0;
 214         while (x) {
 215                 x >>= 1;
 216                 s++;
 217         }
 218         return s;
 219 }
 220
 221 /*
 222  * This is only an example!
 223  */
 224
 225 int main ()
 226 {
 227         printf("%ld\n", f(15));
 228         return 0;
 229 }
 230
 231 /* incomplete lines are bad! */
 232
 233 commit refs/tags/simple
 234 mark :14
 235 author Thomas Rast <trast@student.ethz.ch> 1362044923 +0100
 236 committer Thomas Rast <trast@student.ethz.ch> 1362044923 +0100
 237 data 29
 238 change back to complete line
 239 from :12
 240 M 100644 :13 a.c
 241
 242 commit refs/tags/move-support
 243 mark :15
 244 author Thomas Rast <trast@student.ethz.ch> 1362044968 +0100
 245 committer Thomas Rast <trast@student.ethz.ch> 1362044968 +0100
 246 data 10
 247 move file
 248 from :14
 249 D a.c
 250 M 100644 :13 b.c
 251
 252 blob
 253 mark :16
 254 data 237
 255 #include <unistd.h>
 256 #include <stdio.h>
 257
 258 long f(long x)
 259 {
 260         int s = 0;
 261         while (x) {
 262                 x /= 2;
 263                 s++;
 264         }
 265         return s;
 266 }
 267
 268 /*
 269  * This is only an example!
 270  */
 271
 272 int main ()
 273 {
 274         printf("%ld\n", f(15));
 275         return 0;
 276 }
 277
 278 /* incomplete lines are bad! */
 279
 280 commit refs/tags/move-support
 281 mark :17
 282 author Thomas Rast <trast@student.ethz.ch> 1362044990 +0100
 283 committer Thomas Rast <trast@student.ethz.ch> 1362044990 +0100
 284 data 22
 285 another simple change
 286 from :15
 287 M 100644 :16 b.c
 288
 289 blob
 290 mark :18
 291 data 254
 292 #include <unistd.h>
 293 #include <stdio.h>
 294
 295 long f(long x);
 296
 297 /*
 298  * This is only an example!
 299  */
 300
 301 int main ()
 302 {
 303         printf("%ld\n", f(15));
 304         return 0;
 305 }
 306
 307 /* incomplete lines are bad! */
 308
 309 long f(long x)
 310 {
 311         int s = 0;
 312         while (x) {
 313                 x /= 2;
 314                 s++;
 315         }
 316         return s;
 317 }
 318
 319 commit refs/heads/master
 320 mark :19
 321 author Thomas Rast <trast@student.ethz.ch> 1362045024 +0100
 322 committer Thomas Rast <trast@student.ethz.ch> 1362045024 +0100
 323 data 21
 324 move within the file
 325 from :17
 326 M 100644 :18 b.c
 327
 328 blob
 329 mark :20
 330 data 243
 331 #include <unistd.h>
 332 #include <stdio.h>
 333
 334 long f(long x)
 335 {
 336         int s = 0;
 337         while (x) {
 338                 x >>= 1;
 339                 s++;
 340         }
 341         return s;
 342 }
 343
 344 /*
 345  * This is only a short example!
 346  */
 347
 348 int main ()
 349 {
 350         printf("%ld\n", f(15));
 351         return 0;
 352 }
 353
 354 /* incomplete lines are bad! */
 355
 356 commit refs/heads/parallel-change
 357 mark :21
 358 author Thomas Rast <trast@inf.ethz.ch> 1365776157 +0200
 359 committer Thomas Rast <trast@inf.ethz.ch> 1365776157 +0200
 360 data 55
 361 change on another line of history while rename happens
 362 from :14
 363 M 100644 :20 a.c
 364
 365 blob
 366 mark :22
 367 data 242
 368 #include <unistd.h>
 369 #include <stdio.h>
 370
 371 long f(long x)
 372 {
 373         int s = 0;
 374         while (x) {
 375                 x /= 2;
 376                 s++;
 377         }
 378         return s;
 379 }
 380
 381 /*
 382  * This is only a short example!
 383  */
 384
 385 int main ()
 386 {
 387         printf("%ld\n", f(15));
 388         return 0;
 389 }
 390
 391 /* incomplete lines are bad! */
 392
 393 commit refs/heads/parallel-change
 394 mark :23
 395 author Thomas Rast <trast@inf.ethz.ch> 1365776184 +0200
 396 committer Thomas Rast <trast@inf.ethz.ch> 1365776191 +0200
 397 data 24
 398 Merge across the rename
 399 from :21
 400 merge :17
 401 D a.c
 402 M 100644 :22 b.c
 403
 404 reset refs/heads/parallel-change
 405 from :23
 406