view tests/test-rename-merge1 @ 9144:ad72e3b08bc0

test-tags: enhance the test to probe tag caching better (issue548). - give detailed dumps of .hgtags and localtags content - repeat some query operations to expose cache bugs - ensure that rollback/strip undo tagging operations
author Greg Ward <greg-hg@gerg.ca>
date Thu, 16 Jul 2009 10:39:41 -0400
parents 6c82beaaa11a
children
line wrap: on
line source

#!/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"
hg mv a b
hg mv a2 b2
hg ci -m "rename"
echo "checkout"
hg co 0
echo blahblah > a
echo blahblah > a2
hg mv a2 c2
hg ci -m "modify"
echo "merge"
hg merge -y --debug
hg status -AC
cat b
hg ci -m "merge"
hg debugindex .hg/store/data/b.i
hg debugrename b