Mercurial > hg
view tests/test-empty-dir @ 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 | 33b6c8193652 |
children | 4c94b6d0fb1c |
line wrap: on
line source
#!/bin/sh hg init echo 123 > a hg add a hg commit -m "first" -d "1000000 0" a mkdir sub echo 321 > sub/b hg add sub/b hg commit -m "second" -d "1000000 0" sub/b cat sub/b hg co 0 cat sub/b 2>/dev/null || echo "sub/b not present" test -d sub || echo "sub not present" true