tests/test-pull-pull-corruption.out
author Matt Mackall <mpm@selenic.com>
Sun, 17 Sep 2006 20:43:06 -0500
changeset 3119 b1de36a4b4df
parent 2175 b2ae81a7df29
child 6338 0750f11152fe
permissions -rw-r--r--
merge: simplify prompt code

requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../source2
pulling from ../source1
requesting all changes
adding changesets
adding manifests
adding file changes
added 10 changesets with 10 changes to 1 files
(run 'hg update' to get a working copy)
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 11 changesets, 11 total revisions