Mercurial > hg
view tests/test-committer @ 9717:68a1b9d0663e
update: allow branch crossing without -c or -C, with no uncommitted changes
Update will now allow crossing branches within the same named branch,
when given a specific revision, if the working dir is clean, without
requiring the -c or -C option. Abort if no revision is given and
this would cross branches. Minor change to abort message if
uncommitted changes are found.
Modify test-update-branches and output to reflect the altered case. Modify
test-merge5.out to reflect the altered case. Modify
test-up-local-change.out with new message.
| author | Stuart W Marks <smarks@smarks.org> |
|---|---|
| date | Thu, 05 Nov 2009 10:53:59 +0100 |
| parents | c5b3d3e30de7 |
| children |
line wrap: on
line source
#!/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 echo "[ui]" > .hg/hgrc echo "username = " >> .hg/hgrc hg commit -d '1000000 0' -m commit-1 rm .hg/hgrc hg commit -d '1000000 0' -m commit-1 2>&1 | sed -e "s/'[^']*'/user@host/" echo space > asdf hg commit -d '1000000 0' -u ' ' -m commit-1 true