view tests/test-pull.out @ 2799:b550cd82f92a

Move merge code to its own module Pull update and merge3 out of localrepo into merge.py s/self/repo/ Add temporary API function in hg.py Convert all users
author Matt Mackall <mpm@selenic.com>
date Thu, 03 Aug 2006 15:24:41 -0500
parents 4e35843b2683
children 9d1c3529ebbc
line wrap: on
line source

(the addremove command is deprecated; use add and remove --after instead)
adding foo
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
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
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
foo
2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo
pulling from http://localhost:20059/
searching for changes
no changes found