Mercurial > hg
view tests/test-mq-symlinks.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 | f6c520fd70cf |
children | 49f34b43cf90 |
line wrap: on
line source
a -> a not a symlink a -> b Now at: base.patch applying symlink.patch Now at: symlink.patch a -> b