Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/changelog.tmpl @ 990:5007e0bdeed2
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.
author | mpm@selenic.com |
---|---|
date | Sun, 21 Aug 2005 21:59:55 -0700 |
parents | 4f81068ed8cd |
children | 17703aa4491e |
rev | line source |
---|---|
142 | 1 #header# |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
173
diff
changeset
|
2 <title>#repo|escape#: changelog</title> |
661
148f642d1f8e
Add rss tag in the changelog/filelog html template.
kreijack@inwind.REMOVEME.it
parents:
599
diff
changeset
|
3 <link rel="alternate" type="application/rss+xml" |
148f642d1f8e
Add rss tag in the changelog/filelog html template.
kreijack@inwind.REMOVEME.it
parents:
599
diff
changeset
|
4 href="?cmd=changelog;style=rss" title="RSS feed for #repo|escape#"> |
142 | 5 </head> |
138 | 6 <body> |
168 | 7 |
8 <div class="buttons"> | |
9 <a href="?cmd=tags">tags</a> | |
10 <a href="?cmd=manifest;manifest=#manifest#;path=/">manifest</a> | |
661
148f642d1f8e
Add rss tag in the changelog/filelog html template.
kreijack@inwind.REMOVEME.it
parents:
599
diff
changeset
|
11 <a type="application/rss+xml" href="?cmd=changelog;style=rss">rss</a> |
168 | 12 </div> |
13 | |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
173
diff
changeset
|
14 <h2>changelog for #repo|escape#</h2> |
138 | 15 |
584
9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.
mpm@selenic.com
parents:
201
diff
changeset
|
16 <form action="#"> |
9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.
mpm@selenic.com
parents:
201
diff
changeset
|
17 <p> |
9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.
mpm@selenic.com
parents:
201
diff
changeset
|
18 <label for="search1">search:</label> |
165 | 19 <input type="hidden" name="cmd" value="changelog"> |
584
9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.
mpm@selenic.com
parents:
201
diff
changeset
|
20 <input name="rev" id="search1" type="text" size="30"> |
975
bdd7c53fca00
hgweb: Changed changelog page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
661
diff
changeset
|
21 navigate: <small>#changenav%naventry#</small> |
584
9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.
mpm@selenic.com
parents:
201
diff
changeset
|
22 </p> |
165 | 23 </form> |
138 | 24 |
975
bdd7c53fca00
hgweb: Changed changelog page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
661
diff
changeset
|
25 #entries%changelogentry# |
138 | 26 |
584
9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.
mpm@selenic.com
parents:
201
diff
changeset
|
27 <form action="#"> |
9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.
mpm@selenic.com
parents:
201
diff
changeset
|
28 <p> |
9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.
mpm@selenic.com
parents:
201
diff
changeset
|
29 <label for="search2">search:</label> |
165 | 30 <input type="hidden" name="cmd" value="changelog"> |
584
9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.
mpm@selenic.com
parents:
201
diff
changeset
|
31 <input name="rev" id="search2" type="text" size="30"> |
975
bdd7c53fca00
hgweb: Changed changelog page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
661
diff
changeset
|
32 navigate: <small>#changenav%naventry#</small> |
584
9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.
mpm@selenic.com
parents:
201
diff
changeset
|
33 </p> |
165 | 34 </form> |
138 | 35 |
142 | 36 #footer# |