annotate tests/test-hup.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 fccc90f1994e
children b72562060e45
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
642
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
1 0
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
2 0
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
3 adding changesets
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
4 killed!
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
5 transaction abort!
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
6 rollback completed
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
7 00changelog.d
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
8 00changelog.i
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
9 data
785
46a8dd3145cc Fix undo after aborted commit bug
mpm@selenic.com
parents: 642
diff changeset
10 journal.dirstate