Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/rss/tagentry.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 | a2179e78d18b |
children |
rev | line source |
---|---|
1766
93f54a2b3864
tags-rss support; still shows tip
Peter van Dijk <peter@dataloss.nl>
parents:
diff
changeset
|
1 <item> |
93f54a2b3864
tags-rss support; still shows tip
Peter van Dijk <peter@dataloss.nl>
parents:
diff
changeset
|
2 <title>#tag|escape#</title> |
3413
a2179e78d18b
Fix RSS URLs (closes issue396)
Brendan Cully <brendan@kublai.com>
parents:
3227
diff
changeset
|
3 <link>{urlbase}{url}rev/{node|short}</link> |
1766
93f54a2b3864
tags-rss support; still shows tip
Peter van Dijk <peter@dataloss.nl>
parents:
diff
changeset
|
4 <description><![CDATA[#tag|strip|escape|addbreaks#]]></description> |
93f54a2b3864
tags-rss support; still shows tip
Peter van Dijk <peter@dataloss.nl>
parents:
diff
changeset
|
5 <pubDate>#date|rfc822date#</pubDate> |
93f54a2b3864
tags-rss support; still shows tip
Peter van Dijk <peter@dataloss.nl>
parents:
diff
changeset
|
6 </item> |