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 "[hooks]" > .hg/hgrc

     5

echo 'precommit = echo precommit hook' >> .hg/hgrc

     6

echo 'commit = echo commit hook: $NODE' >> .hg/hgrc

     7

echo a > a

     8

hg add a

     9

hg commit -m "test" -d "0 0"