mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 15:57:43 +03:00
c06e10d43b
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.
8 lines
289 B
Plaintext
8 lines
289 B
Plaintext
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
removing b
|
|
created new head
|
|
% should abort
|
|
abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)
|
|
% should succeed
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|