mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 15:57:43 +03:00
ddd540c49d
record copies in dirstate even if rename was remote this lets us record it properly at commit teach checkfilemerge about copies, including merge cases pull old copy code out of commit extend rename-merge1 test to show file index
27 lines
431 B
Bash
Executable File
27 lines
431 B
Bash
Executable File
#!/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"
|
|
hg debugindex .hg/data/b.i
|
|
hg debugrename b |