mpm@selenic.com cbe151d218 Handle merge with deletions ... If you merge with a repo that has deleted a file after editing it, hg attempted to resolve the file. This (correctly) resulted in hg verify errors because the resolved version didn't show up in the manifests. This moves the manifest resolution before file resolution and decides which files to resolve based on the (partially) resolved manifest. After files are resolved, the final manifest is committed.		2005-05-24 20:30:35 -08:00
..
__init__.py	Add back links from file revisions to changeset revisions	2005-05-03 13:16:10 -08:00
byterange.py	Add back links from file revisions to changeset revisions	2005-05-03 13:16:10 -08:00
fancyopts.py	Add back links from file revisions to changeset revisions	2005-05-03 13:16:10 -08:00
hg.py	Handle merge with deletions	2005-05-24 20:30:35 -08:00
hgweb.py	Prettify the web interface	2005-05-23 20:57:48 -08:00
mdiff.py	Fix braindamaged import in mdiff.	2005-05-20 19:19:25 -08:00
mpatch.c	Add safety checking to mpatch	2005-05-21 13:14:58 -08:00
revlog.py	Remove some debugging code from lazyparser	2005-05-20 17:50:11 -08:00
transaction.py	Warn if we fail to truncate something	2005-05-20 17:20:39 -08:00