-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
log -L: test merge of parallel modify/rename
This tests a toy example of a history like * Merge | \ | * Modify foo | | * | Rename foo->bar | / * Create foo Current log -L fails on this; we'll fix it in the next commit. Signed-off-by: Thomas Rast <trast@inf.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
- Loading branch information
Thomas Rast
authored and
Junio C Hamano
committed
Apr 12, 2013
1 parent
035ff39
commit d51c527
Showing
3 changed files
with
250 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,160 @@ | ||
commit 0469c60bc4837d52d97b1f081dec5f98dea20fed | ||
Merge: ba227c6 6ce3c4f | ||
Author: Thomas Rast <trast@inf.ethz.ch> | ||
Date: Fri Apr 12 16:16:24 2013 +0200 | ||
|
||
Merge across the rename | ||
|
||
|
||
commit 6ce3c4ff690136099bb17e1a8766b75764726ea7 | ||
Author: Thomas Rast <trast@student.ethz.ch> | ||
Date: Thu Feb 28 10:49:50 2013 +0100 | ||
|
||
another simple change | ||
|
||
diff --git a/b.c b/b.c | ||
--- a/b.c | ||
+++ b/b.c | ||
@@ -4,14 +4,14 @@ | ||
long f(long x) | ||
{ | ||
int s = 0; | ||
while (x) { | ||
- x >>= 1; | ||
+ x /= 2; | ||
s++; | ||
} | ||
return s; | ||
} | ||
|
||
/* | ||
* This is only an example! | ||
*/ | ||
|
||
|
||
commit ba227c6632349700fbb957dec2b50f5e2358be3f | ||
Author: Thomas Rast <trast@inf.ethz.ch> | ||
Date: Fri Apr 12 16:15:57 2013 +0200 | ||
|
||
change on another line of history while rename happens | ||
|
||
diff --git a/a.c b/a.c | ||
--- a/a.c | ||
+++ b/a.c | ||
@@ -4,14 +4,14 @@ | ||
long f(long x) | ||
{ | ||
int s = 0; | ||
while (x) { | ||
x >>= 1; | ||
s++; | ||
} | ||
return s; | ||
} | ||
|
||
/* | ||
- * This is only an example! | ||
+ * This is only a short example! | ||
*/ | ||
|
||
|
||
commit 39b6eb2d5b706d3322184a169f666f25ed3fbd00 | ||
Author: Thomas Rast <trast@student.ethz.ch> | ||
Date: Thu Feb 28 10:45:41 2013 +0100 | ||
|
||
touch comment | ||
|
||
diff --git a/a.c b/a.c | ||
--- a/a.c | ||
+++ b/a.c | ||
@@ -3,14 +3,14 @@ | ||
long f(long x) | ||
{ | ||
int s = 0; | ||
while (x) { | ||
x >>= 1; | ||
s++; | ||
} | ||
return s; | ||
} | ||
|
||
/* | ||
- * A comment. | ||
+ * This is only an example! | ||
*/ | ||
|
||
|
||
commit a6eb82647d5d67f893da442f8f9375fd89a3b1e2 | ||
Author: Thomas Rast <trast@student.ethz.ch> | ||
Date: Thu Feb 28 10:45:16 2013 +0100 | ||
|
||
touch both functions | ||
|
||
diff --git a/a.c b/a.c | ||
--- a/a.c | ||
+++ b/a.c | ||
@@ -3,14 +3,14 @@ | ||
-int f(int x) | ||
+long f(long x) | ||
{ | ||
int s = 0; | ||
while (x) { | ||
x >>= 1; | ||
s++; | ||
} | ||
return s; | ||
} | ||
|
||
/* | ||
* A comment. | ||
*/ | ||
|
||
|
||
commit f04fb20f2c77850996cba739709acc6faecc58f7 | ||
Author: Thomas Rast <trast@student.ethz.ch> | ||
Date: Thu Feb 28 10:44:55 2013 +0100 | ||
|
||
change f() | ||
|
||
diff --git a/a.c b/a.c | ||
--- a/a.c | ||
+++ b/a.c | ||
@@ -3,13 +3,14 @@ | ||
int f(int x) | ||
{ | ||
int s = 0; | ||
while (x) { | ||
x >>= 1; | ||
s++; | ||
} | ||
+ return s; | ||
} | ||
|
||
/* | ||
* A comment. | ||
*/ | ||
|
||
|
||
commit de4c48ae814792c02a49c4c3c0c757ae69c55f6a | ||
Author: Thomas Rast <trast@student.ethz.ch> | ||
Date: Thu Feb 28 10:44:48 2013 +0100 | ||
|
||
initial | ||
|
||
diff --git a/a.c b/a.c | ||
--- /dev/null | ||
+++ b/a.c | ||
@@ -0,0 +3,13 @@ | ||
+int f(int x) | ||
+{ | ||
+ int s = 0; | ||
+ while (x) { | ||
+ x >>= 1; | ||
+ s++; | ||
+ } | ||
+} | ||
+ | ||
+/* | ||
+ * A comment. | ||
+ */ | ||
+ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters