##// END OF EJS Templates
Document log date ranges and mention 'hg help dates' for all commands (issue998)
Document log date ranges and mention 'hg help dates' for all commands (issue998)

File last commit:

r5608:784eadab default
r6163:1f733c2f default
Show More
test-rename-after-merge
34 lines | 450 B | text/plain | TextLexer
/ tests / test-rename-after-merge
Patrick Mezard
Test renaming files brought by merge second parent (issue 746)
r5318 #!/bin/sh
# Test issue 746: renaming files brought by the
# second parent of a merge was broken.
echo % create source repository
hg init t
cd t
echo a > a
hg ci -Am a
cd ..
echo % fork source repository
hg clone t t2
cd t2
echo b > b
hg ci -Am b
echo % update source repository
cd ../t
echo a >> a
hg ci -m a2
echo % merge repositories
hg pull ../t2
hg merge
Matt Mackall
copy: simplify inner copy...
r5608 hg st
Patrick Mezard
Test renaming files brought by merge second parent (issue 746)
r5318
echo % rename b as c
hg mv b c
hg st
echo % rename back c as b
hg mv c b
hg st