Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-conflict.out @ 2138:f5046cab9e2e
Fix revlog-ng interaction with old-http.
revlog.py wasn't trying to detect the version of a revlog file that
doesn't exist on the filesystem (as is the case with old-http).
Additionally, there was an off-by-one error in httprangereader.read
(ranges in HTTP Range headers are inclusive), making it get more data
than what was asked for. This made a struct.unpack complain that
"unpack str size does not match format".
Finally, with the two fixes above, test-static-http fails, since
BaseHTTPServer doesn't understand ranges and returns too much data.
Work around that by reading only the specified amount.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Wed, 26 Apr 2006 22:42:07 -0700 |
parents | 7544700fd931 |
children | b2ae81a7df29 |
rev | line source |
---|---|
346 | 1 merge: warning: conflicts during merge |
2 merging a | |
3 merging a failed! | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
4 e7fe8eb3e180+0d24b7662d3e+ tip |
346 | 5 something else |
6 ======= | |
7 something | |
748 | 8 M a |