Andrew's git - gitweb.git/blob - t/t4211/expect.parallel-change-f-to-main

   1commit 0469c60bc4837d52d97b1f081dec5f98dea20fed
   2Merge: ba227c6 6ce3c4f
   3Author: Thomas Rast <trast@inf.ethz.ch>
   4Date:   Fri Apr 12 16:16:24 2013 +0200
   5
   6    Merge across the rename
   7
   8
   9commit 6ce3c4ff690136099bb17e1a8766b75764726ea7
  10Author: Thomas Rast <trast@student.ethz.ch>
  11Date:   Thu Feb 28 10:49:50 2013 +0100
  12
  13    another simple change
  14
  15diff --git a/b.c b/b.c
  16--- a/b.c
  17+++ b/b.c
  18@@ -4,14 +4,14 @@
  19 long f(long x)
  20 {
  21        int s = 0;
  22        while (x) {
  23-               x >>= 1;
  24+               x /= 2;
  25                s++;
  26        }
  27        return s;
  28 }
  29 
  30 /*
  31  * This is only an example!
  32  */
  33 
  34
  35commit ba227c6632349700fbb957dec2b50f5e2358be3f
  36Author: Thomas Rast <trast@inf.ethz.ch>
  37Date:   Fri Apr 12 16:15:57 2013 +0200
  38
  39    change on another line of history while rename happens
  40
  41diff --git a/a.c b/a.c
  42--- a/a.c
  43+++ b/a.c
  44@@ -4,14 +4,14 @@
  45 long f(long x)
  46 {
  47        int s = 0;
  48        while (x) {
  49                x >>= 1;
  50                s++;
  51        }
  52        return s;
  53 }
  54 
  55 /*
  56- * This is only an example!
  57+ * This is only a short example!
  58  */
  59 
  60
  61commit 39b6eb2d5b706d3322184a169f666f25ed3fbd00
  62Author: Thomas Rast <trast@student.ethz.ch>
  63Date:   Thu Feb 28 10:45:41 2013 +0100
  64
  65    touch comment
  66
  67diff --git a/a.c b/a.c
  68--- a/a.c
  69+++ b/a.c
  70@@ -3,14 +3,14 @@
  71 long f(long x)
  72 {
  73        int s = 0;
  74        while (x) {
  75                x >>= 1;
  76                s++;
  77        }
  78        return s;
  79 }
  80 
  81 /*
  82- * A comment.
  83+ * This is only an example!
  84  */
  85 
  86
  87commit a6eb82647d5d67f893da442f8f9375fd89a3b1e2
  88Author: Thomas Rast <trast@student.ethz.ch>
  89Date:   Thu Feb 28 10:45:16 2013 +0100
  90
  91    touch both functions
  92
  93diff --git a/a.c b/a.c
  94--- a/a.c
  95+++ b/a.c
  96@@ -3,14 +3,14 @@
  97-int f(int x)
  98+long f(long x)
  99 {
 100        int s = 0;
 101        while (x) {
 102                x >>= 1;
 103                s++;
 104        }
 105        return s;
 106 }
 107 
 108 /*
 109  * A comment.
 110  */
 111 
 112
 113commit f04fb20f2c77850996cba739709acc6faecc58f7
 114Author: Thomas Rast <trast@student.ethz.ch>
 115Date:   Thu Feb 28 10:44:55 2013 +0100
 116
 117    change f()
 118
 119diff --git a/a.c b/a.c
 120--- a/a.c
 121+++ b/a.c
 122@@ -3,13 +3,14 @@
 123 int f(int x)
 124 {
 125        int s = 0;
 126        while (x) {
 127                x >>= 1;
 128                s++;
 129        }
 130+       return s;
 131 }
 132 
 133 /*
 134  * A comment.
 135  */
 136 
 137
 138commit de4c48ae814792c02a49c4c3c0c757ae69c55f6a
 139Author: Thomas Rast <trast@student.ethz.ch>
 140Date:   Thu Feb 28 10:44:48 2013 +0100
 141
 142    initial
 143
 144diff --git a/a.c b/a.c
 145--- /dev/null
 146+++ b/a.c
 147@@ -0,0 +3,13 @@
 148+int f(int x)
 149+{
 150+       int s = 0;
 151+       while (x) {
 152+               x >>= 1;
 153+               s++;
 154+       }
 155+}
 156+
 157+/*
 158+ * A comment.
 159+ */
 160+