view tests/test-commit-unresolved @ 8050:087cc65bebff

convert/mtn: record changes from directory renames (issue1587) Bug report and initial path by Pavel Volkovitskiy <int@mtx.ru>
author Patrick Mezard <pmezard@gmail.com>
date Sat, 11 Apr 2009 23:12:42 +0200
parents 93609576244e
children 8766fee6f225
line wrap: on
line source

#!/bin/sh

echo "[extensions]" >> $HGRCPATH
echo "graphlog=" >> $HGRCPATH

addcommit () {
    echo $1 > $1
    hg add $1
    hg commit -d "${2} 0" -u test -m $1
}

commit () {
    hg commit -d "${2} 0" -u test -m $1
}

hg init a
cd a
addcommit "A" 0
addcommit "B" 1
echo "C" >> A
commit "C" 2

hg update -C 0
echo "D" >> A
commit "D" 3

echo
echo "% Merging a conflict araises"
hg merge

echo
echo "% Correct the conflict without marking the file as resolved"
echo "ABCD" > A
hg commit -m "Merged"

echo
echo "% Mark the conflict as resolved and commit"
hg resolve -m A
hg commit -m "Merged"

exit 0