merge: allow merging going backwards New behavior is generally superior and more correct, except possibly with regards to missing files. hg up . is now effectively a no-op, which is probably the desired behavior for people expecting to move to tip, but may surprise people who were expecting deleted files to reappear. case 1: update to . a-w -> a-w classic: ancestor a missing recreated right? rmed recreated WRONG added forgotten WRONG changed preserved RIGHT conflicted can't happen backward merge: ancestor a (NO EFFECT) missing missing wrong? rm'ed rm'ed RIGHT added preserved RIGHT changed preserved RIGHT conflicted can't happen case 2: update to ancestor of . a-b-w -> b-w \ a classic: ancestor a missing recreated right? rmed recreated wrong? added forgotten wrong? changed preserved RIGHT conflicted preserved wrong? backwards merge: ancestor b missing missing or conflict right? rm'ed missing or conflict right? changed preserved RIGHT conflicted merge RIGHT added preserved right? [ original upstream message ]

     1

#!/usr/bin/env python

     2

     3

"""This does HTTP GET requests given a host:port and path and returns

     4

a subset of the headers plus the body of the result."""

     5

     6

import httplib, sys, re

     7

     8

try:

     9

    import msvcrt, os

    10

    msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)

    11

    msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)

    12

except ImportError:

    13

    pass

    14

    15

headers = [h.lower() for h in sys.argv[3:]]

    16

conn = httplib.HTTPConnection(sys.argv[1])

    17

conn.request("GET", sys.argv[2])

    18

response = conn.getresponse()

    19

print response.status, response.reason

    20

for h in headers:

    21

    if response.getheader(h, None) is not None:

    22

        print "%s: %s" % (h, response.getheader(h))

    23

print

    24

data = response.read()

    25

data = re.sub('\d+ years', 'many years', data)

    26

sys.stdout.write(data)

    27

    28

if 200 <= response.status <= 299:

    29

    sys.exit(0)

    30

sys.exit(1)