Mercurial > hg
view tests/test-debugindexdot @ 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 | 8838fe5a236f |
children |
line wrap: on
line source
#!/bin/sh # Just exercize debugindexdot # Create a short file history including a merge. hg init t cd t echo a > a hg ci -qAm t1 -d '0 0' echo a >> a hg ci -m t2 -d '1 0' hg up -qC 0 echo b >> a hg ci -m t3 -d '2 0' HGMERGE=true hg merge -q hg ci -m merge -d '3 0' hg debugindexdot .hg/store/data/a.i