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

adding a
adding b
0
0
0
a: No such file in rev 03f6b0774996
1