Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/gitweb/footer.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 |
---|---|
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
1 <div class="page_footer"> |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
2 <div class="page_footer_text">#repo|escape#</div> |
5266
46c5e1ee8aaa
Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
3473
diff
changeset
|
3 <a class="rss_logo" href="#url#rss-log">RSS</a> |
46c5e1ee8aaa
Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
3473
diff
changeset
|
4 <a class="rss_logo" href="#url#atom-log">Atom</a> |
3473
2896ce093ec4
Add #motd# to gitweb pages. Needs to pass self.motd to index template, too.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3270
diff
changeset
|
5 <br /> |
2896ce093ec4
Add #motd# to gitweb pages. Needs to pass self.motd to index template, too.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3270
diff
changeset
|
6 #motd# |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
7 </div> |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
8 </body> |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
9 </html> |