tests/test-rename-merge1
author Renato Cunha <renatoc@gmail.com>
Fri, 02 Jul 2010 16:21:36 -0300
changeset 11533 5be8760d2fb3
parent 8167 6c82beaaa11a
permissions -rwxr-xr-x
setup.py: Add 'mercurial' as include dir for the inotify compiler. This patch adds access to util.h for the inotify C module by adding the "mercurial" directory as an include dir, enabling access to the macros defined in util.h.

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