Mercurial > hg
view tests/test-fetch.out @ 4333:4f721e96f1de
Add test for issue 529 - "mq aborts when merging patch deleting files".
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sat, 07 Apr 2007 19:42:26 +0100 |
parents | e0caea53c997 |
children | 86f5d8f608b7 |
line wrap: on
line source
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