Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-clone-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 | dc1bbc456b96 |
children | 3053fc33f545 |
comparison
equal
deleted
inserted
replaced
2015:1a09814a5b1f | 2019:ced2d3620f95 |
---|---|
116 searching for changes | 116 searching for changes |
117 adding changesets | 117 adding changesets |
118 adding manifests | 118 adding manifests |
119 adding file changes | 119 adding file changes |
120 added 4 changesets with 2 changes to 3 files (+1 heads) | 120 added 4 changesets with 2 changes to 3 files (+1 heads) |
121 (run 'hg update' to get a working copy) | 121 (run 'hg heads' to see heads, 'hg merge' to merge) |
122 checking changesets | 122 checking changesets |
123 checking manifests | 123 checking manifests |
124 crosschecking files in changesets and manifests | 124 crosschecking files in changesets and manifests |
125 checking files | 125 checking files |
126 4 files, 9 changesets, 7 total revisions | 126 4 files, 9 changesets, 7 total revisions |