Fix long-standing excessive file merges
Since switching to the multihead approach, we've been creating
excessive file-level merges where files are marked as merged with
their ancestors.
This explicitly checks at commit time whether the two parent versions
are linearly related, and if so, reduces the file check-in to a
non-merge. Then the file is compared against the remaining parent,
and, if equal, skips check-in of that file (as it's not changed).
Since we're not checking in all files that were different between
versions, we no longer need to mark so many files for merge. This
removes most of the 'm' state marking as well.
Finally, it is possible to do a tree-level merge with no file-level
changes. This will happen if one user changes file A and another
changes file B. Thus, if we have have two parents, we allow commit to
proceed even if there are no file-level changes.
repo the name of the repo
rev a changeset.manifest revision
node a changeset node
changesets total number of changesets
file a filename
filenode a file node
filerev a file revision
filerevs total number of file revisions
up the directory of the relevant file
path a path in the manifest, starting with "/"
basename a short pathname
manifest a manifest node
manifestrev a manifest revision
date a date string
age age in hours, days, etc
line a line of text (escaped)
desc a description (escaped, with breaks)
shortdesc a short description (escaped)
author a name or email addressv(obfuscated)
parent a list of the parent
tags a list of tag
header the global page header
footer the global page footer
files a list of file links
dirs a set of directory links
diff a diff of one or more files
annotate an annotated file
entries the entries relevant to the page
Templates and commands:
changelog(rev) - a page for browsing changesets
naventry - a link for jumping to a changeset number
filenodelink - jump to file diff
fileellipses - printed after maxfiles
changelogentry - an entry in the log
manifest - browse a manifest as a directory tree