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

#!/usr/bin/env python
#

import doctest

import mercurial.changelog
# test doctest from changelog

doctest.testmod(mercurial.changelog)