view tests/test-unrelated-pull.out @ 2897:dd032b0f02ac

merge: move forgets to the apply stage
author Matt Mackall <mpm@selenic.com>
date Tue, 15 Aug 2006 18:30:21 -0500
parents ced2d3620f95
children 8c4fd0de5de8
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
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