Mercurial > hg
view tests/test-pull-update.out @ 9574:9e9f63d5c456
encoding: fix issue with non-standard UTF-8 CTYPE on OS X
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Sat, 10 Oct 2009 12:00:43 +0200 |
parents | 0750f11152fe |
children | a3d73b3e1f8a |
line wrap: on
line source
adding foo updating working directory 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