2 Commits

Author	SHA1	Message	Date
Matt Mackall	fb8b59de16	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)	2008-03-24 10:01:05 -05:00
Matt Mackall	cfe7a0a522	merge: make test for fast-forward merge stricter (issue619) ... don't allow merging with an ancestor fix != on contexts add a test	2007-07-05 13:34:18 -05:00