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

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

raise util.Abort again if specified revision is not an integer....
raise util.Abort again if specified revision is not an integer. This was changed to NoRepo in 462cc56d898f, because specifying non-integer revisions for e.g. the Mercurial backend caused Abort to be raised in the subversion importer. Now util.Abort is raised again, but the check is done after verifying if it really is a subversion repository.
Alexis S. L. Carvalho - - Load All Authors

File last commit:

r4387:93a4e72b default
r5145:0751c25e default
Show More
test-conflict.out
15 lines | 386 B | text/plain | TextLexer
/ tests / test-conflict.out
History | Source | Raw |Copy content |Copy permalink
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Alexis S. L. Carvalho
change tests to use simplemerge by default
 r4365 warning: conflicts during merge.
mpm@selenic.com
merge3: fix argument order...
 r346 merging a
merging a 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, you can redo the full merge using:
hg update -C 2
hg merge 1
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 e7fe8eb3e180+0d24b7662d3e+ tip
Alexis S. L. Carvalho
run-tests.py: pass -L/--label to simplemerge...
 r4387 <<<<<<< my
mpm@selenic.com
merge3: fix argument order...
 r346 something else
=======
something
Alexis S. L. Carvalho
run-tests.py: pass -L/--label to simplemerge...
 r4387 >>>>>>> other
mpm@selenic.com
Update test output for status change...
 r748 M a