tests/test-committer
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 11 Dec 2006 18:09:52 +0100
changeset 3869 ad6f34c83c3d
parent 3722 5191e2299d63
child 4044 78a0dd93db0b
permissions -rwxr-xr-x
Add instructions how to redo/finish failed merge with local working directory. b2ae81a7df29 already implemented this for branch merges.

#!/bin/sh

unset HGUSER
EMAIL="My Name <myname@example.com>"
export EMAIL

hg init test
cd test
touch asdf
hg add asdf
hg commit -d '1000000 0' -m commit-1
hg tip

unset EMAIL
echo 1234 > asdf
hg commit -d '1000000 0' -u "foo@bar.com" -m commit-1
hg tip
echo "[ui]" >> .hg/hgrc
echo "username = foobar <foo@bar.com>" >> .hg/hgrc
echo 12 > asdf
hg commit -d '1000000 0' -m commit-1
hg tip
echo 1 > asdf
hg commit -d '1000000 0' -u "foo@bar.com" -m commit-1
hg tip
echo 123 > asdf
rm .hg/hgrc
hg commit -d '1000000 0' -m commit-1 2>&1 | sed -e "s/'[^']*'/user@host/"