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.

Minor fixes to verify

Fix transaction handling bug by reverting fileopener change

Fix pos in navbar Fix bad parent link in changelog

Prettify the web interface Add header, footer templates Add null parent handling Combine files and directories Add parity flag for alternating line colors Add line numbers to filerevision

Simple script to recompress a log file

Minor safety checks to manifest diff

Minor updates to comparison

Revamped templated hgweb

Merge from hgweb

added annotate fixed error page to get tmpl_dir

change template to a generator add write call to output generator

fix problem with non wrapping file list fix file list not appearing in checkin

added template support for some hgweb output, also, template files for the parts that have been converted

making hgweb class

moving hgweb to mercurial subdir

Make hg diff handle files that have been added but not yet committed.

Fix diff and export not showing added files

Add safety checking to mpatch

Fix braindamaged import in mdiff.

Remove some debugging code from lazyparser

Remove python version of the patches code

Remove debugoldmerge command

hg history: don't print file list without -v switch

Subdir support for annotate

Use revlog.delta and mdiff.patchtext to massively speed up processing of manifests. This lets us verify a 28k changeset kernel repo in under two minutes.

Add a function to return the new text from a binary diff

Add code to retrieve or construct a revlog delta

Add fileopener to move some pathname knowledge from filelog to repository

Make revision code slightly faster