Mercurial > hg
view tests/test-mq-qrefresh-replace-log-message.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 | 448eb46d4d84 |
children | fb32ae9c76e7 |
line wrap: on
line source
======================= Should fail if no patches applied No patches applied No patches applied ======================= Should display 'First commit message' description: First commit message ======================= Should display 'Second commit message' description: Second commit message ======================= Should display 'Third commit message\n This is the 3rd log message' description: Third commit message This is the 3rd log message ======================= Should display 'Fifth commit message\n This is the 5th log message' description: Fifth commit message