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

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

Add instructions how to redo/finish failed merge with local working directory....
Add instructions how to redo/finish failed merge with local working directory. b2ae81a7df29 already implemented this for branch merges.
Thomas Arendsen Hein - - Load All Authors

File last commit:

r3869:ad6f34c8 default
r3869:ad6f34c8 default
Show More
test-merge-revert2.out
37 lines | 934 B | text/plain | TextLexer
/ tests / test-merge-revert2.out
History | Source | Raw |Copy content |Copy permalink
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 1:f248da0d4c3e
0:9eca13a34789
f248da0d4c3e tip
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 9eca13a34789
9eca13a34789+
Vadim Gelfer
rewrite revert command. fix issues 93, 123, 147....
 r2029 reverting file1
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 9eca13a34789
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 f248da0d4c3e tip
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
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
Make hg update more verbose by default (issue12)...
 r2175 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
There are unresolved merges with locally modified files.
Thomas Arendsen Hein
Add instructions how to redo/finish failed merge with local working directory....
 r3869 You can redo the full merge using:
hg update 0
hg update 1
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 diff -r f248da0d4c3e file1
Thomas Arendsen Hein
Added tests for bug with three-way-merging of old tip, tip and cwd.
 r792 --- a/file1
+++ b/file1
mason@suse.com
Add new bdiff based unidiff generation.
 r1637 @@ -1,3 +1,7 @@ added file1
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
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 f248da0d4c3e+ tip
Vadim Gelfer
rewrite revert command. fix issues 93, 123, 147....
 r2029 reverting file1
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 f248da0d4c3e tip
f248da0d4c3e tip
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 f248da0d4c3e tip