Pass filename to $HGMERGE This lets the merge program be slightly more user-friendly

Improve pruning of branches in outstanding changeset algorithm These changes make the client keep track of what it's seen more carefully to avoid some redundant requests.

A new ancestor algorithm The old ancestor algorithm could get fooled into returning ancestors closer to root than it ought to. Hopefully this one, which strictly orders its search by distance from room, will be foolproof.

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