##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Clean up some merge logic...
Clean up some merge logic - rename mode to branch_merge - use explicit update mode - use negative mtime for updates that set mtime - expand some cryptic variable names - elaborate merge dirstate comments - remove redundant manifest lookup for non-merge case - remove impossible merge case - fix up test cases
mpm@selenic.com - - Load All Authors

File last commit:

r925:5a034646 default
r993:6f274afc default
Show More
test-merge-revert2.out
26 lines | 425 B | text/plain | TextLexer
/ tests / test-merge-revert2.out
History | Source | Raw |Copy content |Copy permalink
mpm@selenic.com
run-tests: remove '+ hg' trick...
 r925 1:f4d7a8c73d23
0:232e179b3f29
Thomas Arendsen Hein
Extended test case to test dirstate length bug fixed in a7e95e3606c7.
 r864 f4d7a8c73d23 tip
232e179b3f29
232e179b3f29+
232e179b3f29
f4d7a8c73d23 tip
Thomas Arendsen Hein
Added tests for bug with three-way-merging of old tip, tip and cwd.
 r792 merge: warning: conflicts during merge
merging file1
merging file1 failed!
Thomas Arendsen Hein
Extended test case to test dirstate length bug fixed in a7e95e3606c7.
 r864 diff -r f4d7a8c73d23 file1
Thomas Arendsen Hein
Added tests for bug with three-way-merging of old tip, tip and cwd.
 r792 --- a/file1
+++ b/file1
Thomas Arendsen Hein
Extended test case to test dirstate length bug fixed in a7e95e3606c7.
 r864 @@ -1,3 +1,7 @@
Thomas Arendsen Hein
Added tests for bug with three-way-merging of old tip, tip and cwd.
 r792 added file1
Thomas Arendsen Hein
Extended test case to test dirstate length bug fixed in a7e95e3606c7.
 r864 another line of text
Thomas Arendsen Hein
Added tests for bug with three-way-merging of old tip, tip and cwd.
 r792 +<<<<<<<
+changed file1 different
+=======
changed file1
+>>>>>>>
M file1
Thomas Arendsen Hein
Extended test case to test dirstate length bug fixed in a7e95e3606c7.
 r864 f4d7a8c73d23+ tip
f4d7a8c73d23 tip
f4d7a8c73d23 tip
f4d7a8c73d23 tip