Mercurial > hg
view tests/test-commit-unresolved @ 8822:1027da7d2fb9
doc: fix regexp for determining the man page section
Preceding a .* pattern with an other dot serves little purpose,
better anchor the regexp to the start of the file name.
author | Cédric Duval <cedricduval@free.fr> |
---|---|
date | Wed, 10 Jun 2009 19:59:44 +0200 |
parents | 8766fee6f225 |
children |
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" -m $1 } commit () { hg commit -d "${2} 0" -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