comparison tests/test-push-r.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 284fc722c342
children 3053fc33f545
comparison
equal deleted inserted replaced
2015:1a09814a5b1f 2019:ced2d3620f95
125 searching for changes 125 searching for changes
126 adding changesets 126 adding changesets
127 adding manifests 127 adding manifests
128 adding file changes 128 adding file changes
129 added 4 changesets with 2 changes to 3 files (+1 heads) 129 added 4 changesets with 2 changes to 3 files (+1 heads)
130 (run 'hg update' to get a working copy) 130 (run 'hg heads' to see heads, 'hg merge' to merge)
131 checking changesets 131 checking changesets
132 checking manifests 132 checking manifests
133 crosschecking files in changesets and manifests 133 crosschecking files in changesets and manifests
134 checking files 134 checking files
135 4 files, 9 changesets, 7 total revisions 135 4 files, 9 changesets, 7 total revisions