annotate tests/test-bad-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 2a676ad52c22
children 30c7564f6dfc
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
395
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
1 requesting all changes
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 705
diff changeset
2 abort: error: Connection refused
503
c6a2e41c8c60 Fix troubles with clone and exception handling
mpm@selenic.com
parents: 395
diff changeset
3 255
1962
2a676ad52c22 tests: more portability fix for the old systems
TK Soh <teekaysoh@yahoo.com>
parents: 925
diff changeset
4 copy: No such file or directory
395
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
5 requesting all changes
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
6 abort: HTTP Error 404: File not found
503
c6a2e41c8c60 Fix troubles with clone and exception handling
mpm@selenic.com
parents: 395
diff changeset
7 255