Mercurial > hg

comparison tests/test-merge5.out @ 6375:cdc458b12f0f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: better logic and messages for updates - complain about attempts to merge with ancestor - when updating, differentiate between - crossing named branches with no local changes (jump) - crossing named branches with local changes (complain) - nonlinear update on the same named branch, no changes (complain some more) - nonlinear update on the same named branch, changes (different complaining)
author Matt Mackall <mpm@selenic.com>
date Mon, 24 Mar 2008 10:01:05 -0500
parents 6aa4a3fa4e60
children 0b89315d5de2
comparison
equal deleted inserted replaced
6374:31a01e3d99cc 6375:cdc458b12f0f
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2 removing b 2 removing b
3 created new head 3 created new head
4 % should abort 4 % should abort
5 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes 5 abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes)
6 % should succeed 6 % should succeed
7 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 7 abort: crosses branches (use 'hg merge'or 'hg update -C')