Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/template-vars.txt @ 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 | e0069e7fe419 |
children |
rev | line source |
---|---|
138 | 1 repo the name of the repo |
2 rev a changeset.manifest revision | |
3 node a changeset node | |
4 changesets total number of changesets | |
5 file a filename | |
6 filerev a file revision | |
7 filerevs total number of file revisions | |
8 up the directory of the relevant file | |
9 path a path in the manifest, starting with "/" | |
10 basename a short pathname | |
11 date a date string | |
12 age age in hours, days, etc | |
13 line a line of text (escaped) | |
14 desc a description (escaped, with breaks) | |
3232
e0069e7fe419
Fix minor indentation problem in template-vars.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3205
diff
changeset
|
15 shortdesc a short description (escaped) |
138 | 16 author a name or email addressv(obfuscated) |
598
f8d44a2e6928
[PATCH 4/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
138
diff
changeset
|
17 parent a list of the parent |
1606
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
598
diff
changeset
|
18 child a list of the children |
598
f8d44a2e6928
[PATCH 4/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
138
diff
changeset
|
19 tags a list of tag |
138 | 20 |
21 header the global page header | |
22 footer the global page footer | |
23 | |
24 files a list of file links | |
3190 | 25 file_copies a list of pairs of name, source filenames |
138 | 26 dirs a set of directory links |
27 diff a diff of one or more files | |
28 annotate an annotated file | |
29 entries the entries relevant to the page | |
30 | |
31 Templates and commands: | |
32 changelog(rev) - a page for browsing changesets | |
33 naventry - a link for jumping to a changeset number | |
34 filenodelink - jump to file diff | |
35 fileellipses - printed after maxfiles | |
36 changelogentry - an entry in the log | |
3190 | 37 manifest - browse a manifest as a directory tree |