Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/old/shortlog.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 |
---|---|
2686
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
1 #header# |
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
2 <title>#repo|escape#: shortlog</title> |
5266
46c5e1ee8aaa
Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
3263
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:
3263
diff
changeset
|
4 href="#url#atom-log" title="Atom feed for #repo|escape#"> |
2686
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
5 <link rel="alternate" type="application/rss+xml" |
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
6 href="?cmd=changelog;style=rss" title="RSS feed for #repo|escape#"> |
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
7 </head> |
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
8 <body> |
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
9 |
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
10 <div class="buttons"> |
2687
46b19175fec6
[hgweb] links to shortlog for the default templates
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
2686
diff
changeset
|
11 <a href="?cl=#rev#">changelog</a> |
2686
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
12 <a href="?cmd=tags">tags</a> |
3205 | 13 <a href="?mf=#node|short#;path=/">manifest</a> |
2686
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
14 #archives%archiveentry# |
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
15 <a type="application/rss+xml" href="?style=rss">rss</a> |
5266
46c5e1ee8aaa
Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
3263
diff
changeset
|
16 <a type="application/atom+xml" href="#url#atom-log" title="Atom feed for #repo|escape#">atom</a> |
2686
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
17 </div> |
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
18 |
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
19 <h2>shortlog for #repo|escape#</h2> |
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
20 |
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
21 <form action="#"> |
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
22 <p> |
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
23 <label for="search1">search:</label> |
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
24 <input type="hidden" name="cmd" value="changelog"> |
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
25 <input name="rev" id="search1" type="text" size="30"> |
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
26 navigate: <small class="navigate">#changenav%navshortentry#</small> |
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
27 </p> |
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
28 </form> |
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
29 |
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
30 #entries%shortlogentry# |
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
31 |
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
32 <form action="#"> |
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
33 <p> |
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
34 <label for="search2">search:</label> |
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
35 <input type="hidden" name="cmd" value="changelog"> |
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
36 <input name="rev" id="search2" type="text" size="30"> |
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
37 navigate: <small class="navigate">#changenav%navshortentry#</small> |
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
38 </p> |
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
39 </form> |
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
40 |
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff
changeset
|
41 #footer# |