view tests/test-pull-pull-corruption.out @ 2743:a31f0f2997e9

import: switch from application/x-patch to text/x-diff christian ebert says his mailer was broken.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Mon, 31 Jul 2006 12:02:13 -0700
parents b2ae81a7df29
children 0750f11152fe
line wrap: on
line source

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