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
05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
changeset: 2:9f827976dae4
tag: tip
user: test
date: Thu Jan 1 00:00:00 1970 +0000
summary: 2
05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
changeset: 3:142428fbbcc5
tag: tip
user: test
date: Thu Jan 1 00:00:00 1970 +0000
summary: 3
d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
changeset: 4:4d450f9aa680
tag: tip
user: test
date: Thu Jan 1 00:00:00 1970 +0000
summary: 4
05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
3570202ceac2b52517df64ebd0a062cb0d8fe33a 644 c
changeset: 4:4d450f9aa680
user: test
date: Thu Jan 1 00:00:00 1970 +0000
summary: 4
d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
changeset: 6:b4b8b9afa8cc
tag: tip
parent: 4:4d450f9aa680
parent: 5:a7925a42d0df
user: test
date: Thu Jan 1 00:00:00 1970 +0000
summary: 6
d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
changeset: 7:f84d0b1b024e
tag: tip
user: test
date: Thu Jan 1 00:00:00 1970 +0000
summary: 7