sapling/tests/test-merge8
Thomas Arendsen Hein ccb1957113 Test for 1de7d8df2123 (update dirstate correctly for non-branchmerge updates)
(Test case created by Johannes Hofmann)
2006-10-14 10:53:29 +02:00

20 lines
263 B
Bash
Executable File

#!/bin/sh
# Test for changeset ba7c74081861
# (update dirstate correctly for non-branchmerge updates)
hg init a
cd a
echo a > a
hg add a
hg commit -m a
cd ..
hg clone a b
cd a
hg mv a b
hg commit -m move
echo b >> b
hg commit -m b
cd ../b
hg pull ../a
hg update