view tests/test-unrelated-pull.out @ 4398:3b7e284b8f28

merge: expand and simplify the invalid handling for directory moves
author Matt Mackall <mpm@selenic.com>
date Thu, 03 May 2007 17:24:43 -0500
parents 8c4fd0de5de8
children
line wrap: on
line source

pulling from ../a
searching for changes
abort: repository is unrelated
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)
changeset:   1:bdcee5d51fa6
tag:         tip
parent:      -1:000000000000
user:        a
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     a

changeset:   0:f155ba1aa5ba
user:        b
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     b