comparison tests/test-pull-pull-corruption.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 81ca1a9bd061
children 3053fc33f545
comparison
equal deleted inserted replaced
2015:1a09814a5b1f 2019:ced2d3620f95
14 searching for changes 14 searching for changes
15 adding changesets 15 adding changesets
16 adding manifests 16 adding manifests
17 adding file changes 17 adding file changes
18 added 1 changesets with 1 changes to 1 files (+1 heads) 18 added 1 changesets with 1 changes to 1 files (+1 heads)
19 (run 'hg update' to get a working copy) 19 (run 'hg heads' to see heads, 'hg merge' to merge)
20 checking changesets 20 checking changesets
21 checking manifests 21 checking manifests
22 crosschecking files in changesets and manifests 22 crosschecking files in changesets and manifests
23 checking files 23 checking files
24 1 files, 11 changesets, 11 total revisions 24 1 files, 11 changesets, 11 total revisions