Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-pull-update.out @ 5152:b51d07ed1b18
demandimport: ignore pwd and grp.
Both are unavailable under Windows and tarfile detects them via ImportError.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Mon, 13 Aug 2007 19:42:52 +0200 |
parents | 73fdc8bd3ed8 |
children |
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