Mercurial > hg

annotate tests/test-bad-pull.out @ 6206:0b6f12495276

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fetch: switch the default parent used for a merge This treats newly pulled changes as authoritative, and local changes as the "satellite" changes. The prior default behaviour is still available, via the --switch-parent option.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed, 05 Mar 2008 09:10:45 -0800
parents 5eb02f9ed804
children 490e40816cbd
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 705
diff changeset
1 abort: error: Connection refused
503
c6a2e41c8c60 Fix troubles with clone and exception handling
mpm@selenic.com
parents: 395
diff changeset
2 255
1962
2a676ad52c22 tests: more portability fix for the old systems
TK Soh <teekaysoh@yahoo.com>
parents: 925
diff changeset
3 copy: No such file or directory
2438
a765f853439d test-bad-pull: fix change in error output.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2108
diff changeset
4 abort: HTTP Error 404
a765f853439d test-bad-pull: fix change in error output.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2108
diff changeset
5 0