Clean up some merge logic - rename mode to branch_merge - use explicit update mode - use negative mtime for updates that set mtime - expand some cryptic variable names - elaborate merge dirstate comments - remove redundant manifest lookup for non-merge case - remove impossible merge case - fix up test cases

     1

#!/bin/sh

     2

     3

hg init

     4

echo a > a

     5

hg add a

     6

hg commit -m "1" -d "0 0"

     7

hg status

     8

cp a b

     9

hg copy a b

    10

hg status

    11

hg --debug commit -m "2" -d "0 0"

    12

hg history

    13

hg log a

    14

md5sum .hg/data/b.d

    15

hg cat b > bsum

    16

md5sum bsum

    17

hg cat a > asum

    18

md5sum asum

    19

hg verify