Mercurial > hg
view tests/test-586.out @ 9730:732fc0e9d411
patchbomb: fix 'echo -en' bashism in test-patchbomb
The echo command doesn't accept options in some shells.
printf is required by the SUSv2 (Single UNIX Specification v2).
author | Marti Raudsepp <marti@juffo.org> |
---|---|
date | Fri, 06 Nov 2009 13:48:17 +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