view tests/test-issue672 @ 9852:917cf6bb6d0c

url: generalise HTTPS proxy handling to accomodate Python changes

Python 2.6.3 introduced HTTPS proxy tunnelling in a way that interferes with
the way HTTPS proxying is handled in Mercurial. This fix generalises it to work
on Python 2.4 to 2.6.

#!/bin/sh

# 0-2-4
#  \ \ \
#   1-3-5
#
# rename in #1, content change in #4.

hg init t
cd t

touch 1
touch 2
hg commit -Am init  # 0

hg rename 1 1a
hg commit -m rename # 1

hg co -C 0
echo unrelated >> 2
hg ci -m unrelated1 # 2

hg merge --debug 1
hg ci -m merge1 # 3

hg co -C 2
echo hello >> 1
hg ci -m unrelated2 # 4

hg co -C 3
hg merge -y --debug 4

hg co -C 4
hg merge -y --debug 3