tests/test-fetch.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Fri, 24 Aug 2007 00:52:28 +0200
changeset 5214 551958d5082c
parent 2823 e0caea53c997
child 5798 86f5d8f608b7
permissions -rw-r--r--
testcase for issue705 (fixed by 316ce5e85b3e)

adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
1:97d72e5f12c7
% should pull one change
pulling from ../a
searching for 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
1:97d72e5f12c7
adding c
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
merging with new head 2:97d72e5f12c7
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
new changeset 3:cd3a41621cf0 merges remote changes with local
a
b
c