Fix up some bugs introduced by recent merge changes - use new changed list to track what files actually got new revlog entries at commit/rawcommit time - when updating a file during a merge, don't mark it as completely unchanged - handle file not being in parent 1 in status

\.elc$
\.orig$
\.rej$
~$
\.so$
\.pyc$
\.swp$
\.prof$
^tests/.*\.err$
^build/
^dist/
^doc/.*\.[0-9](\.(x|ht)ml)?$
^MANIFEST$
^\.pc/
^patches/
^mercurial/__version__.py$