Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-pull-pull-corruption2.out @ 3257:c93ce7f10f85
merge: fixes for merge+rename
findcopies: ignore files renamed on both branches
applyupdates: change remove flag to move
recordupdates: record copy actions, including local moves and deletions
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 04 Oct 2006 19:08:04 -0500 |
| parents | 57729c56a23c |
| children |
line wrap: on
line source
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) requesting all changes adding changesets adding manifests adding file changes added 10 changesets with 10 changes to 1 files checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 10 changesets, 10 total revisions checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 10 changesets, 10 total revisions