Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/changelog.tmpl @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 27 Oct 2007 16:27:55 +0400 |
parents | 46c5e1ee8aaa |
children |
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> |
5266
46c5e1ee8aaa
Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
3363
diff
changeset
|
3 <link rel="alternate" type="application/atom+xml" |
46c5e1ee8aaa
Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
3363
diff
changeset
|
4 href="#url#atom-log" title="Atom feed for #repo|escape#"> |
661
148f642d1f8e
Add rss tag in the changelog/filelog html template.
kreijack@inwind.REMOVEME.it
parents:
599
diff
changeset
|
5 <link rel="alternate" type="application/rss+xml" |
3264
d1aa83f199ef
Update templates to use NewWebInterface
Brendan Cully <brendan@kublai.com>
parents:
3205
diff
changeset
|
6 href="#url#rss-log" title="RSS feed for #repo|escape#"> |
142 | 7 </head> |
138 | 8 <body> |
168 | 9 |
10 <div class="buttons"> | |
3363
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3362
diff
changeset
|
11 <a href="#url#shortlog/#rev#{sessionvars%urlparameter}">shortlog</a> |
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3362
diff
changeset
|
12 <a href="#url#tags{sessionvars%urlparameter}">tags</a> |
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3362
diff
changeset
|
13 <a href="#url#file/#node|short#{sessionvars%urlparameter}">manifest</a> |
2170
29eeb2717915
Add archive download links to tip on main changeset list page
Colin McMillen <mcmillen@cs.cmu.edu>
parents:
1425
diff
changeset
|
14 #archives%archiveentry# |
3264
d1aa83f199ef
Update templates to use NewWebInterface
Brendan Cully <brendan@kublai.com>
parents:
3205
diff
changeset
|
15 <a type="application/rss+xml" href="#url#rss-log">rss</a> |
5266
46c5e1ee8aaa
Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
3363
diff
changeset
|
16 <a type="application/atom+xml" href="#url#atom-log" title="Atom feed for #repo|escape#">atom</a> |
168 | 17 </div> |
18 | |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
173
diff
changeset
|
19 <h2>changelog for #repo|escape#</h2> |
138 | 20 |
3264
d1aa83f199ef
Update templates to use NewWebInterface
Brendan Cully <brendan@kublai.com>
parents:
3205
diff
changeset
|
21 <form action="#url#log"> |
3362
887da2247b57
hgweb: Keep session variables (currently only style) in HTML forms, too.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3272
diff
changeset
|
22 {sessionvars%hiddenformentry} |
584
9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.
mpm@selenic.com
parents:
201
diff
changeset
|
23 <p> |
9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.
mpm@selenic.com
parents:
201
diff
changeset
|
24 <label for="search1">search:</label> |
9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.
mpm@selenic.com
parents:
201
diff
changeset
|
25 <input name="rev" id="search1" type="text" size="30"> |
1425
8fe4116b3253
hgweb: improve look-n-feel of changelog nagivation
TK Soh <teekaysoh@yahoo.com>
parents:
1410
diff
changeset
|
26 navigate: <small class="navigate">#changenav%naventry#</small> |
584
9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.
mpm@selenic.com
parents:
201
diff
changeset
|
27 </p> |
165 | 28 </form> |
138 | 29 |
975
bdd7c53fca00
hgweb: Changed changelog page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
661
diff
changeset
|
30 #entries%changelogentry# |
138 | 31 |
3264
d1aa83f199ef
Update templates to use NewWebInterface
Brendan Cully <brendan@kublai.com>
parents:
3205
diff
changeset
|
32 <form action="#url#log"> |
3362
887da2247b57
hgweb: Keep session variables (currently only style) in HTML forms, too.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3272
diff
changeset
|
33 {sessionvars%hiddenformentry} |
584
9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.
mpm@selenic.com
parents:
201
diff
changeset
|
34 <p> |
9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.
mpm@selenic.com
parents:
201
diff
changeset
|
35 <label for="search2">search:</label> |
9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.
mpm@selenic.com
parents:
201
diff
changeset
|
36 <input name="rev" id="search2" type="text" size="30"> |
1425
8fe4116b3253
hgweb: improve look-n-feel of changelog nagivation
TK Soh <teekaysoh@yahoo.com>
parents:
1410
diff
changeset
|
37 navigate: <small class="navigate">#changenav%naventry#</small> |
584
9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.
mpm@selenic.com
parents:
201
diff
changeset
|
38 </p> |
165 | 39 </form> |
138 | 40 |
142 | 41 #footer# |