largefiles: fall back to the original for change/delete conflicts The largefiles merge code (currently) does not handle change/delete conflicts. So fall back to regular filemerge in that case. Making this code handle change/delete conflicts is left as an exercise for the future.

mergestate.add: store absentfilectxes as nullhex This is the most natural way to represent these files. We also need to make sure we don't try to store these files in the merge store.

mergestate._resolve: handle change/delete conflicts We will represent a deleted file as 'nullhex' in the in-memory and on-disk merge states. We need to be able to create absentfilectxes in that case, and delete the file from disk rather than try to write it out.

filemerge: don't try to copy files known to be absent We set 'back' to None in this case, so we need to handle that as well.

hgweb: use absolute_import

hgweb: import wsgicgi at top level There should be no practical reason to delay the import of wsgicgi.

hgweb: import BaseHTTPServer as module at top level This will avoid future warning spotted by the import checker.

hgweb: do not import hgweb_mod.hgweb and .makebreadcrumb as symbol It will be enforced by the import checker.