Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/raw/manifest.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 | 472d9670e6e9 |
children |
rev | line source |
---|---|
3935
472d9670e6e9
hgweb: add raw manifest template
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
1 {header} |
472d9670e6e9
hgweb: add raw manifest template
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
2 {dentries%manifestdirentry}{fentries%manifestfileentry} |
472d9670e6e9
hgweb: add raw manifest template
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
3 {footer} |