Mercurial > hg
view tests/test-586.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 | f1af59451c0c |
children |
line wrap: on
line source
adding a adding b pulling from ../a searching for changes warning: repository is unrelated adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) C b % create test repos adding a adding b pulling from ../repoa requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../repob searching for changes warning: repository is unrelated adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) % merge both repos 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) % move b content src/b tst/a