patch: better handling of sequence of offset patch hunks (issue1941) The built-in patch implementation applied the hunks to the wrong lines of the file if the file in the repo has been modified to skew the patch line numbers and the file contains repetitive sequences of lines.

     1

#!/bin/sh

     2

     3

hg init

     4

echo "nothing" > a

     5

hg add a

     6

hg commit -m ancestor -d "1000000 0"

     7

echo "something" > a

     8

hg commit -m branch1 -d "1000000 0"

     9

hg co 0

    10

echo "something else" > a

    11

hg commit -m branch2 -d "1000000 0"

    12

hg merge 1

    13

hg id

    14

cat a

    15

hg status