tests/test-pull-pull-corruption.out
author Patrick Mezard <pmezard@gmail.com>
Thu, 21 May 2009 22:43:38 +0200
changeset 8539 9a4fe59b1eca
parent 6338 0750f11152fe
child 9611 a3d73b3e1f8a
permissions -rw-r--r--
test-merge-tools: windows fixes - /bin/cat does not exist, expect 'cat' - non-interactive mode is not correctly detected in pysh, force it

requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
updating working directory
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