tests/test-586.out
author Jason Harris <jason@jasonfharris.com>
Sat, 03 Jul 2010 05:24:16 +0200
changeset 11655 6faf015e0ba0
parent 7564 f1af59451c0c
permissions -rw-r--r--
templates: 'children' keyword The template keyword 'parents' is already present and this just provides the complimentary template keyword.

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