sapling/tests/test-unrelated-pull.out
Vadim Gelfer dfe0de6855 add merge command. means same thing as "update -m".
repo.addchangegroup method now returns number of heads modified and added,
so command line can tell whether update or merge needed.  this makes
tiny change to ssh wire protocol, but change is backwards compatible.

pull command now returns 0 if no changes to pull.
2006-03-29 10:27:16 -08:00

23 lines
529 B
Plaintext

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