Mercurial > hg
view tests/test-rollback @ 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 | 88b4d726332a |
children | 720f70b720d3 |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init echo a > a hg add a hg commit -m "test" -d "1000000 0" hg verify hg parents hg status hg rollback hg verify hg parents hg status echo % Test issue 902 hg commit -m "test" hg branch test hg rollback hg branch echo % Test rollback of hg before issue 902 was fixed hg commit -m "test" hg branch test rm .hg/undo.branch hg rollback hg branch