view tests/test-merge8 @ 11065:76d6c19aa8ef

keyword: cleanup test and make it portable

- replace sed call with python command
- no need to back up hgrc before record

#!/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