diff tests/test-unrelated-pull.out @ 2019:ced2d3620f95

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.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Wed, 29 Mar 2006 10:27:16 -0800
parents dac4bd67f6c5
children 8c4fd0de5de8
line wrap: on
line diff
--- a/tests/test-unrelated-pull.out	Wed Mar 29 12:45:33 2006 +0200
+++ b/tests/test-unrelated-pull.out	Wed Mar 29 10:27:16 2006 -0800
@@ -8,7 +8,7 @@
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
-(run 'hg update' to get a working copy)
+(run 'hg heads' to see heads, 'hg merge' to merge)
 changeset:   1:bdcee5d51fa6
 tag:         tip
 user:        a