view tests/test-rawcommit1 @ 3295:764688cf51e5

merge: remember rename copies and parents properly on commit record copies in dirstate even if rename was remote this lets us record it properly at commit teach checkfilemerge about copies, including merge cases pull old copy code out of commit extend rename-merge1 test to show file index
author Matt Mackall <mpm@selenic.com>
date Sun, 08 Oct 2006 19:57:45 -0500
parents 7544700fd931
children 9fe62e2db71d
line wrap: on
line source

#!/bin/sh
hg --debug init
echo this is a1 > a
hg add a
hg commit -m0 -d "1000000 0"
echo this is b1 > b
hg add b
hg commit -m1 -d "1000000 0"
hg manifest 1
echo this is c1 > c
hg rawcommit -p 1 -d "1000000 0" -m2 c
hg manifest 2
hg parents
rm b
hg rawcommit -p 2 -d "1000000 0" -m3 b
hg manifest 3
hg parents
echo this is a22 > a
hg rawcommit -p 3 -d "1000000 0" -m4 a
hg manifest 4
hg parents
echo this is c22 > c
hg rawcommit -p 1 -d "1000000 0" -m5 c
hg manifest 5
hg parents
# merge, but no files changed
hg rawcommit -p 4 -p 5 -d "1000000 0" -m6
hg manifest 6
hg parents
# no changes what-so-ever
hg rawcommit -p 6 -d "1000000 0" -m7
hg manifest 7
hg parents