Mercurial > hg
view tests/test-identify.out @ 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 | af6a63438a8a |
children | a4fbbe0fbc38 |
line wrap: on
line source
% no repo abort: There is no Mercurial repository here (.hg not found) % create repo adding a % basic id usage cb9a9f314b8b tip cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b tip cb9a9f314b8b cb9a9f314b8b tip % with options cb9a9f314b8b tip 0 tip default cb9a9f314b8b cb9a9f314b8b 0 default tip % with modifications cb9a9f314b8b+ 0+ default tip % other local repo cb9a9f314b8b+ tip cb9a9f314b8b+ tip % with remote http repo cb9a9f314b8b % remote with tags? abort: can't query remote revision number, branch, or tags