tests/test-bad-pull.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 14 Oct 2008 20:13:53 +0200
changeset 7104 9514cbb6e4f6
parent 2444 5eb02f9ed804
child 7903 490e40816cbd
permissions -rw-r--r--
bdiff: normalize the diff (issue1295) When the common part of a diff can be moved forward, move it forward. Otherwise we don't get deterministic results (it would depends on the way we split for the recursion). That way we get identical hunks when doing the same change, it helps to solve issue1295 (inconsistent diffs on different side during a merge).
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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