Mercurial > hg
view tests/test-pull-update.out @ 6219:d43c94414ba1
hgweb: fix test results missed by 6218:345a23eca8f6
author | Peter Arrenbrecht <peter.arrenbrecht@gmail.com> |
---|---|
date | Fri, 07 Mar 2008 08:38:07 +0100 |
parents | 73fdc8bd3ed8 |
children | 0750f11152fe |
line wrap: on
line source
adding foo 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % should fail pulling from ../tt searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) not updating, since new heads added (run 'hg heads' to see heads, 'hg merge' to merge) % should fail pulling from ../t searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) not updating, since new heads added (run 'hg heads' to see heads, 'hg merge' to merge) merging foo 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) % should work pulling from ../tt searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (-1 heads) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved