##// 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:

r4682:dc5920ea default
r5145:0751c25e default
Show More
test-merge9
31 lines | 487 B | text/plain | TextLexer
/ tests / test-merge9
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
# test that we don't interrupt the merge session if
# a file-level merge failed
hg init repo
cd repo
echo foo > foo
echo a > bar
hg ci -Am 'add foo' -d '0 0'
hg mv foo baz
echo b >> bar
echo quux > quux1
hg ci -Am 'mv foo baz' -d '0 0'
hg up -qC 0
echo >> foo
echo c >> bar
echo quux > quux2
hg ci -Am 'change foo' -d '0 0'
# test with the rename on the remote side
HGMERGE=false hg merge
# test with the rename on the local side
hg up -C 1
HGMERGE=false hg merge
true