Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/atom/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 | b962f82cfd61 |
children |
rev | line source |
---|---|
5266
46c5e1ee8aaa
Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
diff
changeset
|
1 Content-type: application/atom+xml; charset={encoding} |
46c5e1ee8aaa
Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
diff
changeset
|
2 |
46c5e1ee8aaa
Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
diff
changeset
|
3 <?xml version="1.0" encoding="{encoding}"?> |
5267
b962f82cfd61
Atom support: replaced xhtml namespace prefix with default namespace
Robert Bachmann <rbach@rbach.priv.at>
parents:
5266
diff
changeset
|
4 <feed xmlns="http://www.w3.org/2005/Atom"> |