Mercurial > hg
annotate tests/test-merge6.out @ 7180:a42d27bc809d
hgweb: be sure to drain request data even in early error conditions
Thanks to Mads Kiilerich with noticing this. The hg client can only read data
after all the sent data has been read, so we have to read all the request data
even if we're not going to do anything with it (in error conditions). This
is not easy to fix in the client, because we're using Python's httplib, which
is strictly stateful. Abstracted the draining into a separate method.
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Mon, 20 Oct 2008 10:15:26 +0200 |
parents | 0750f11152fe |
children | a3d73b3e1f8a |
rev | line source |
---|---|
6338
0750f11152fe
clone: print "updating working directory" status message
Adrian Buehlmann <adrian@cadifra.com>
parents:
5405
diff
changeset
|
1 updating working directory |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
2 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6338
0750f11152fe
clone: print "updating working directory" status message
Adrian Buehlmann <adrian@cadifra.com>
parents:
5405
diff
changeset
|
3 updating working directory |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6338
0750f11152fe
clone: print "updating working directory" status message
Adrian Buehlmann <adrian@cadifra.com>
parents:
5405
diff
changeset
|
5 updating working directory |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
6 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
616 | 7 pulling from ../B1 |
8 searching for changes | |
9 adding changesets | |
10 adding manifests | |
775 | 11 adding file changes |
1043 | 12 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:
1043
diff
changeset
|
13 (run 'hg heads' to see heads, 'hg merge' to merge) |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
14 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
15 (branch merge, don't forget to commit) |
616 | 16 bar should remain deleted. |
5405
8feb33c2d153
Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents:
2175
diff
changeset
|
17 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo |
616 | 18 pulling from ../A2 |
19 searching for changes | |
20 adding changesets | |
21 adding manifests | |
775 | 22 adding file changes |
1043 | 23 added 1 changesets with 0 changes to 0 files (+1 heads) |
2019
ced2d3620f95
add merge command. means same thing as "update -m".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1043
diff
changeset
|
24 (run 'hg heads' to see heads, 'hg merge' to merge) |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
25 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
26 (branch merge, don't forget to commit) |
616 | 27 bar should remain deleted. |
5405
8feb33c2d153
Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents:
2175
diff
changeset
|
28 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo |