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

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

run-tests: give each child its own tmp dir (issue1911)...
run-tests: give each child its own tmp dir (issue1911) Fixes bug introduced by f8b4df4b033d (issue1911: --tmpdir plus parallel mode = fail), and also fixes the long-standing quirk that parallel mode created multiple /tmp/hgtests.XXXXXX directories. Now there is only one /tmp/hgtests.XXXXXX, with child0, child1, etc. under it.
Matt Mackall - - Load All Authors

File last commit:

r6518:92ccccb5 default
r9899:be574a37 stable
Show More
test-merge-revert2.out
38 lines | 909 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
Matt Mackall
merge: allow smarter tool configuration...
 r6004 merging file1
Alexis S. L. Carvalho
change tests to use simplemerge by default
 r4365 warning: conflicts during merge.
Thomas Arendsen Hein
Added tests for bug with three-way-merging of old tip, tip and cwd.
 r792 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
Matt Mackall
resolve: new command...
 r6518 use 'hg resolve' to retry unresolved file merges
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
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -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
Matt Mackall
merge: allow smarter tool configuration...
 r6004 +<<<<<<< local
Thomas Arendsen Hein
Added tests for bug with three-way-merging of old tip, tip and cwd.
 r792 +changed file1 different
+=======
changed file1
Alexis S. L. Carvalho
run-tests.py: pass -L/--label to simplemerge...
 r4387 +>>>>>>> other
Thomas Arendsen Hein
Added tests for bug with three-way-merging of old tip, tip and cwd.
 r792 M file1
Matt Mackall
merge: allow smarter tool configuration...
 r6004 ? file1.orig
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
Matt Mackall
merge: allow smarter tool configuration...
 r6004 ? file1.orig
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 f248da0d4c3e tip
Matt Mackall
merge: allow smarter tool configuration...
 r6004 ? file1.orig
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 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall
merge: allow smarter tool configuration...
 r6004 ? file1.orig
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 f248da0d4c3e tip