Mercurial > hg
diff tests/test-issue619.out @ 6375:cdc458b12f0f
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 | 8808ea7da86b |
children | 5b48d819d5f9 |
line wrap: on
line diff
--- a/tests/test-issue619.out Mon Mar 24 16:20:15 2008 +0100 +++ b/tests/test-issue619.out Mon Mar 24 10:01:05 2008 -0500 @@ -6,5 +6,5 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) bogus fast-forward should fail -abort: there is nothing to merge, just use 'hg update' or look at 'hg heads' +abort: can't merge with ancestor done