Mercurial > hg
view tests/test-copy @ 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 | c0b449154a90 |
children | 997ab9af81df |
line wrap: on
line source
#!/bin/sh hg init echo a > a hg add a hg commit -m "1" -d "1000000 0" hg status hg copy a b hg status hg --debug commit -m "2" -d "1000000 0" echo "we should see two history entries" hg history -v echo "we should see one log entry for a" hg log a echo "this should show a revision linked to changeset 0" hg debugindex .hg/store/data/a.i echo "we should see one log entry for b" hg log b echo "this should show a revision linked to changeset 1" hg debugindex .hg/store/data/b.i echo "this should show the rename information in the metadata" hg debugdata .hg/store/data/b.d 0 | head -3 | tail -2 $TESTDIR/md5sum.py .hg/store/data/b.i hg cat b > bsum $TESTDIR/md5sum.py bsum hg cat a > asum $TESTDIR/md5sum.py asum hg verify