tests/test-issue619.out
author Matt Mackall <mpm@selenic.com>
Wed, 03 Oct 2007 17:17:28 -0500
changeset 5368 61462e7d62ed
parent 4748 8808ea7da86b
child 6375 cdc458b12f0f
permissions -rw-r--r--
changegroup: avoid large copies - handle chunk headers separately rather than prepending them to (potentially large) chunks - break large chunks into 1M pieces for compression - don't prepend file metadata onto (potentially large) file data

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: there is nothing to merge, just use 'hg update' or look at 'hg heads'
done