Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/filelogentry.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 | ce8f31e0b3b8 |
children |
rev | line source |
---|---|
2132
4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2130
diff
changeset
|
1 <table class="logEntry parity#parity#"> |
4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2130
diff
changeset
|
2 <tr> |
4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2130
diff
changeset
|
3 <th class="age">#date|age# ago:</th> |
3363
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3272
diff
changeset
|
4 <th class="firstline"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#desc|strip|firstline|escape#</a></th> |
2132
4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2130
diff
changeset
|
5 </tr> |
4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2130
diff
changeset
|
6 <tr> |
4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2130
diff
changeset
|
7 <th class="revision">revision #filerev#:</td> |
4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2130
diff
changeset
|
8 <td class="node"> |
3363
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3272
diff
changeset
|
9 <a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a> |
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3272
diff
changeset
|
10 <a href="#url#diff/#node|short#/#file|urlescape#{sessionvars%urlparameter}">(diff)</a> |
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3272
diff
changeset
|
11 <a href="#url#annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}">(annotate)</a> |
2132
4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2130
diff
changeset
|
12 </td> |
4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2130
diff
changeset
|
13 </tr> |
4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2130
diff
changeset
|
14 #rename%filelogrename# |
4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2130
diff
changeset
|
15 <tr> |
4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2130
diff
changeset
|
16 <th class="author">author:</th> |
4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2130
diff
changeset
|
17 <td class="author">#author|obfuscate#</td> |
4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2130
diff
changeset
|
18 </tr> |
4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2130
diff
changeset
|
19 <tr> |
4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2130
diff
changeset
|
20 <th class="date">date:</th> |
4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2130
diff
changeset
|
21 <td class="date">#date|date#</td> |
4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2130
diff
changeset
|
22 </tr> |
142 | 23 </table> |
138 | 24 |
25 |