Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/raw/fileannotate.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 | a63be0dfa42e |
children |
rev | line source |
---|---|
1694
03cb6bf43a9b
Added raw view for file annotate in hgweb.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
1 #header# |
03cb6bf43a9b
Added raw view for file annotate in hgweb.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
2 #annotate%annotateline# |
03cb6bf43a9b
Added raw view for file annotate in hgweb.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
3 #footer# |
03cb6bf43a9b
Added raw view for file annotate in hgweb.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
4 |
03cb6bf43a9b
Added raw view for file annotate in hgweb.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
5 |