merge: update dirstate correctly for non-branchmerge updates
- we don't actually need the context in recordupdates
- use -1 for filesize to force check on normal update
- only record copy for branchmerges
- forget moved files on update
changeset: 0:9c2cf2b35aa7
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: add foo
changeset: 1:3756a9556b89
tag: tip
user: test
date: Mon Jan 12 13:46:41 1970 +0000
summary: change foo
2 revisions:
9c2cf2b35aa7
3756a9556b89