tests/test-merge2
author Hollis Blanchard <hollisb@us.ibm.com>
Wed, 15 Mar 2006 03:19:16 +0100
changeset 1950 5f581f337b05
parent 1933 7544700fd931
child 3988 9dcf9d45cab8
permissions -rwxr-xr-x
hgk "committer:" bug I've been having an hgk problem with this tree: http://xenbits.xensource.com/ext/linux-ppc-2.6.hg, specifically changeset 93c590d23a53. The problem seems to be that the commit message contains a "committer:" line, which triggers a (relatively unused?) case in hgk.py... Both cases need the dates at the end of the line.

#!/bin/sh

mkdir t
cd t
hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "1000000 0"
rm b
hg update 0
echo This is file b2 > b
hg add b
hg commit -m "commit #2" -d "1000000 0"
cd ..; /bin/rm -rf t

mkdir t
cd t
hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "1000000 0"
rm b
hg update 0
echo This is file b2 > b
hg commit -A -m "commit #2" -d "1000000 0"
cd ..; /bin/rm -rf t

mkdir t
cd t
hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "1000000 0"
rm b
hg remove b
hg update 0
echo This is file b2 > b
hg commit -A -m "commit #2" -d "1000000 0"
cd ..; /bin/rm -rf t