annotate tests/test-addremove.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 eef8ff46567a
children 4e35843b2683
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1623
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
1 adding dir/bar
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
2 adding foo
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
3 dir/bar
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
4 foo
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
5 adding dir/bar_2
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
6 adding foo_2
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
7 dir/bar_2
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
8 foo_2