Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/rss/map @ 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 | 105253b30239 |
children |
rev | line source |
---|---|
1901
c64bef3d7043
use safer string parser for template engine.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1766
diff
changeset
|
1 default = 'changelog' |
3276
105253b30239
Moved hgweb map-* files into their style directories and adjusted them.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3227
diff
changeset
|
2 header = header.tmpl |
105253b30239
Moved hgweb map-* files into their style directories and adjusted them.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3227
diff
changeset
|
3 changelog = changelog.tmpl |
105253b30239
Moved hgweb map-* files into their style directories and adjusted them.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3227
diff
changeset
|
4 changelogentry = changelogentry.tmpl |
105253b30239
Moved hgweb map-* files into their style directories and adjusted them.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3227
diff
changeset
|
5 filelog = filelog.tmpl |
105253b30239
Moved hgweb map-* files into their style directories and adjusted them.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3227
diff
changeset
|
6 filelogentry = filelogentry.tmpl |
105253b30239
Moved hgweb map-* files into their style directories and adjusted them.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3227
diff
changeset
|
7 tags = tags.tmpl |
105253b30239
Moved hgweb map-* files into their style directories and adjusted them.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3227
diff
changeset
|
8 tagentry = tagentry.tmpl |