Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templates/atom/changelogentry.tmpl
author Maxim Dounin <mdounin@mdounin.ru>
Sat, 27 Oct 2007 16:27:55 +0400
changeset 5483 0c43f87baba3
parent 5267 b962f82cfd61
permissions -rw-r--r--
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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5266
46c5e1ee8aaa Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
diff changeset 
     1
 
 <entry>
46c5e1ee8aaa Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
diff changeset 
     2
 
  <title>#desc|strip|firstline|strip|escape#</title>
46c5e1ee8aaa Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
diff changeset 
     3
 
  <id>http://www.selenic.com/mercurial/#changeset-{node}</id>
46c5e1ee8aaa Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
diff changeset 
     4
 
  <link href="{urlbase}{url}rev/{node}"/>
46c5e1ee8aaa Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
diff changeset 
     5
 
  <author>
46c5e1ee8aaa Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
diff changeset 
     6
 
   <name>#author|person|escape#</name>
46c5e1ee8aaa Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
diff changeset 
     7
 
   <email>#author|email|obfuscate#</email>
46c5e1ee8aaa Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
diff changeset 
     8
 
  </author>
46c5e1ee8aaa Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
diff changeset 
     9
 
  <updated>#date|rfc3339date#</updated>
46c5e1ee8aaa Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
diff changeset 
    10
 
  <published>#date|rfc3339date#</published>
46c5e1ee8aaa Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
diff changeset 
    11
 
  <content type="xhtml">
5267
b962f82cfd61 Atom support: replaced xhtml namespace prefix with default namespace
Robert Bachmann <rbach@rbach.priv.at>
parents: 5266
diff changeset 
    12
 
   <div xmlns="http://www.w3.org/1999/xhtml">
b962f82cfd61 Atom support: replaced xhtml namespace prefix with default namespace
Robert Bachmann <rbach@rbach.priv.at>
parents: 5266
diff changeset 
    13
 
    <pre xml:space="preserve">#desc|escape#</pre>
b962f82cfd61 Atom support: replaced xhtml namespace prefix with default namespace
Robert Bachmann <rbach@rbach.priv.at>
parents: 5266
diff changeset 
    14
 
   </div>
5266
46c5e1ee8aaa Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
diff changeset 
    15
 
  </content>
46c5e1ee8aaa Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
diff changeset 
    16
 
 </entry>
mercurial-crew-with-dirclash