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

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

add -r/--rev and --base option to bundle...
add -r/--rev and --base option to bundle --rev is used to specify a target rev (like pull or clone) --base REV is used to specify a base instead of a target repo the target repo is assumed to have all the rev specified in --base
Matt Mackall - - Load All Authors

File last commit:

r3251:c93ce7f1 default
r3284:d89e9884 default
Show More
test-rename-merge1
25 lines | 388 B | text/plain | TextLexer
/ tests / test-rename-merge1
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
mkdir t
cd t
hg init
echo "[merge]" >> .hg/hgrc
echo "followcopies = 1" >> .hg/hgrc
echo foo > a
echo foo > a2
hg add a a2
hg ci -m "start" -d "0 0"
hg mv a b
hg mv a2 b2
hg ci -m "rename" -d "0 0"
echo "checkout"
hg co 0
echo blahblah > a
echo blahblah > a2
hg mv a2 c2
hg ci -m "modify" -d "0 0"
echo "merge"
hg merge -y --debug
hg status -AC
cat b
hg ci -m "merge" -d "0 0"