Mercurial > hg
view tests/test-commit-unresolved @ 12378:ab237534d800 stable
mq: always require --force when pushing patches (issue2363)
--force was not necessary when passing --rev since 55578a8d7e84, but this
behaviour is usually harmful when branch names are passed instead of explicit
revisions.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Wed, 22 Sep 2010 23:51:10 +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