Mercurial > hg
view tests/test-lock-badness @ 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 |
line wrap: on
line source
#!/bin/sh hg init a echo a > a/a hg --cwd a ci -A -m a hg clone a b echo b > b/b hg --cwd b ci -A -m b chmod 100 a/.hg/store hg --cwd b push ../a chmod 700 a/.hg/store