mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
e777df13c0
- save dirstate lookup and exists check - do all fs work inside a single dryrun clause - move unlinking into inner copy section - move target dir creation - eliminate undelete mess - fix a bug on mv a -> b -> a after merge
35 lines
450 B
Bash
Executable File
35 lines
450 B
Bash
Executable File
#!/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
|
|
hg st
|
|
|
|
echo % rename b as c
|
|
hg mv b c
|
|
hg st
|
|
echo % rename back c as b
|
|
hg mv c b
|
|
hg st
|