comparison tests/test-flags.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 7544700fd931
children b2ae81a7df29
comparison
equal deleted inserted replaced
2015:1a09814a5b1f 2019:ced2d3620f95
9 searching for changes 9 searching for changes
10 adding changesets 10 adding changesets
11 adding manifests 11 adding manifests
12 adding file changes 12 adding file changes
13 added 1 changesets with 1 changes to 1 files (+1 heads) 13 added 1 changesets with 1 changes to 1 files (+1 heads)
14 (run 'hg update' to get a working copy) 14 (run 'hg heads' to see heads, 'hg merge' to merge)
15 changeset: 2:b833d578451e 15 changeset: 2:b833d578451e
16 tag: tip 16 tag: tip
17 parent: 0:4536b1c2ca69 17 parent: 0:4536b1c2ca69
18 user: test 18 user: test
19 date: Mon Jan 12 13:46:40 1970 +0000 19 date: Mon Jan 12 13:46:40 1970 +0000