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

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

update the branch cache at the end of addchangegroup...
update the branch cache at the end of addchangegroup This should avoid a bad performance problem when the branch cache is not up-to-date, and hgweb can't write an updated version because it lacks permissions.
Alexis S. L. Carvalho - - Load All Authors

File last commit:

r4682:dc5920ea default
r5988:ee317dbf 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