Mercurial > hg

view tests/test-586.out @ 7680:89c2b78faec4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: eliminate use of sed -i (which fails on NetBSD)
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Thu, 22 Jan 2009 14:33:49 +0100
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