Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/rss/changelogentry.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 |
---|---|
599 | 1 <item> |
1511
a91bfbbe88d3
hgweb: remove redundant rstrip filter
TK Soh <teekaysoh@yahoo.com>
parents:
1445
diff
changeset
|
2 <title>#desc|strip|firstline|strip|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> |
1445
56281e086f38
hgweb: add strip and rstrip filters to handle summary
TK Soh <teekaysoh@yahoo.com>
parents:
1410
diff
changeset
|
4 <description><![CDATA[#desc|strip|escape|addbreaks#]]></description> |
599 | 5 <author>#author|obfuscate#</author> |
6 <pubDate>#date|rfc822date#</pubDate> | |
7 </item> |