Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/rss/header.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 | be5d099e7a62 |
children |
rev | line source |
---|---|
3946
be5d099e7a62
Send encoding information in rss header
Edouard Gomez <ed.gomez@free.fr>
parents:
3413
diff
changeset
|
1 Content-type: text/xml; charset={encoding} |
599 | 2 |
3946
be5d099e7a62
Send encoding information in rss header
Edouard Gomez <ed.gomez@free.fr>
parents:
3413
diff
changeset
|
3 <?xml version="1.0" encoding="{encoding}"?> |
599 | 4 <rss version="2.0"> |
5 <channel> | |
3413
a2179e78d18b
Fix RSS URLs (closes issue396)
Brendan Cully <brendan@kublai.com>
parents:
3227
diff
changeset
|
6 <link>{urlbase}{url}</link> |
599 | 7 <language>en-us</language> |