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 a

     4

cd a

     5

echo a > foo

     6

hg add foo

     7

hg commit -m 1 -d "0 0"

     8

rm foo

     9

hg remove foo

    10

hg commit -m 2 -d "0 0"

    11

    12

cd ..

    13

hg clone a b