Mercurial > hg
view tests/test-dirstatedirs @ 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 | 6dab29f6df37 |
children |
line wrap: on
line source
#!/bin/sh # test dirstate._dirs refcounting hg init t cd t mkdir -p a/b/c/d touch a/b/c/d/x touch a/b/c/d/y touch a/b/c/d/z hg ci -Am m hg mv a z