Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/gitweb/index.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 |
---|---|
3214 | 1 #header# |
2 <title>Mercurial repositories index</title> | |
3 </head> | |
4 <body> | |
5 | |
6 <div class="page_header"> | |
7 <a href="http://www.selenic.com/mercurial/" title="Mercurial"><div style="float:right;">Mercurial</div></a>Repositories list | |
8 </div> | |
9 | |
10 <table cellspacing="0"> | |
11 <tr> | |
12 <td><a href="?sort=#sort_name#">Name</a></td> | |
13 <td><a href="?sort=#sort_description#">Description</a></td> | |
14 <td><a href="?sort=#sort_contact#">Contact</a></td> | |
15 <td><a href="?sort=#sort_lastchange#">Last change</a></td> | |
16 <td> </td> | |
5266
46c5e1ee8aaa
Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
3473
diff
changeset
|
17 <td> </td> |
3214 | 18 <tr> |
19 #entries%indexentry# | |
20 </table> | |
21 <div class="page_footer"> | |
3473
2896ce093ec4
Add #motd# to gitweb pages. Needs to pass self.motd to index template, too.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3226
diff
changeset
|
22 #motd# |
3214 | 23 </div> |
24 </body> | |
25 </html> |