Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-unrelated-pull.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 | ced2d3620f95 |
children | 8c4fd0de5de8 |
rev | line source |
---|---|
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff
changeset
|
1 pulling from ../a |
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff
changeset
|
2 searching for changes |
1960
dac4bd67f6c5
update test for unrelated repo.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset
|
3 abort: repository is unrelated |
dac4bd67f6c5
update test for unrelated repo.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset
|
4 pulling from ../a |
dac4bd67f6c5
update test for unrelated repo.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset
|
5 searching for changes |
dac4bd67f6c5
update test for unrelated repo.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset
|
6 warning: repository is unrelated |
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff
changeset
|
7 adding changesets |
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff
changeset
|
8 adding manifests |
775 | 9 adding file changes |
1043 | 10 added 1 changesets with 1 changes to 1 files (+1 heads) |
2019
ced2d3620f95
add merge command. means same thing as "update -m".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1960
diff
changeset
|
11 (run 'hg heads' to see heads, 'hg merge' to merge) |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1043
diff
changeset
|
12 changeset: 1:bdcee5d51fa6 |
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff
changeset
|
13 tag: tip |
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff
changeset
|
14 user: a |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1043
diff
changeset
|
15 date: Mon Jan 12 13:46:40 1970 +0000 |
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff
changeset
|
16 summary: a |
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff
changeset
|
17 |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1043
diff
changeset
|
18 changeset: 0:f155ba1aa5ba |
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff
changeset
|
19 user: b |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1043
diff
changeset
|
20 date: Mon Jan 12 13:46:40 1970 +0000 |
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff
changeset
|
21 summary: b |
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff
changeset
|
22 |