Mercurial > hg
comparison contrib/shrink-revlog.py @ 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 | 18b134ef294c |
children | 69dca8574a6a 9df52218810d |
comparison
equal
deleted
inserted
replaced
9716:ea8c207a0f78 | 9717:68a1b9d0663e |
---|