Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 2015:1a09814a5b1f | 2019:ced2d3620f95 |
|---|---|
| 6 warning: repository is unrelated | 6 warning: repository is unrelated |
| 7 adding changesets | 7 adding changesets |
| 8 adding manifests | 8 adding manifests |
| 9 adding file changes | 9 adding file changes |
| 10 added 1 changesets with 1 changes to 1 files (+1 heads) | 10 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 11 (run 'hg update' to get a working copy) | 11 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 12 changeset: 1:bdcee5d51fa6 | 12 changeset: 1:bdcee5d51fa6 |
| 13 tag: tip | 13 tag: tip |
| 14 user: a | 14 user: a |
| 15 date: Mon Jan 12 13:46:40 1970 +0000 | 15 date: Mon Jan 12 13:46:40 1970 +0000 |
| 16 summary: a | 16 summary: a |