Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-confused-revert.out @ 1981:736b6c96bbbc
make incoming work via ssh (issue139); move chunk code into separate module.
Incoming ssh needs to detect the end of the changegroup, otherwise it would
block trying to read from the ssh pipe. This is done by parsing the
changegroup chunks.
bundlerepo.getchunk() already is identical to
localrepo.addchangegroup.getchunk(), which is followed by getgroup which
looks much like what you can re-use in bundlerepository.__init__() and in
write_bundle(). bundlerevlog.__init__.genchunk() looks very similar, too,
as do some while loops in localrepo.py.
Applied patch from Benoit Boissinot to move duplicate/related code
to mercurial/changegroup.py and use this to fix incoming ssh.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 21 Mar 2006 11:47:21 +0100 |
parents | 30146be3437c |
children | d436b21b20dc |
rev | line source |
---|---|
1449
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
1 %%% should show a removed and b added |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
2 A b |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
3 R a |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
4 reverting... |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
5 %%% should show b unknown and a back to normal |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
6 ? b |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
7 merging a |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
8 %%% should show foo-b |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
9 foo-b |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
10 %%% should show a removed and b added |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
11 A b |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
12 R a |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
13 reverting... |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
14 %%% should show b unknown and a marked modified (merged) |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
15 ? b |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
16 %%% should show foo-b |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
17 foo-b |