sapling/tests/test-issue619.out

adding a
marked working directory as branch b
adding b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
fast-forward
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: can't merge with ancestor
done
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 22:34:18 +04:00			`adding a`
			`marked working directory as branch b`
			`adding b`
			`0 files updated, 0 files merged, 1 files removed, 0 files unresolved`
			`fast-forward`
			`1 files updated, 0 files merged, 0 files removed, 0 files unresolved`
			`(branch merge, don't forget to commit)`
			`bogus fast-forward should fail`
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 18:01:05 +03:00			`abort: can't merge with ancestor`
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 22:34:18 +04:00			`done`