Mercurial > hg
annotate tests/test-convert-bzr-merges.out @ 10301:56b50194617f
templates: rename `Last change' column in hgwebdir repository list.
This patch changes column headers in the templates that previously
said `Last change' to `Last modified'. Neither code nor functionality
are changed other than that.
For some time now, I have been annoyed by the fact the `Last change'
column didn't list the age of the youngest changeset in the
repository, or at least tip. It just occurred to me that this is
because the wording is slightly misleading; what the column in fact
lists is when the repository was last *modified*, that is, when
changesets was last added or removed from it.
The word `change' can be understood as referring to the changeset
itself. Using `changed' would be ever so slightly less
amigous. However, the standard nomenclature in this case is
`modification date' and `Last modified', which is incidentally entirely
unambigous. Hence, `Last modified' is the wording used.
| author | Dan Villiom Podlaski Christiansen <danchr@gmail.com> |
|---|---|
| date | Sun, 24 Jan 2010 20:51:53 +0100 |
| parents | 209ef5f3534c |
| children |
| rev | line source |
|---|---|
| 7053 | 1 % test multiple merges at once |
| 2 initializing destination source-hg repository | |
| 3 scanning source... | |
| 4 sorting... | |
| 5 converting... | |
| 6 4 Initial add | |
| 7 3 Added branch1 file | |
| 8 2 Added parent file | |
| 9 1 Added brach2 file | |
| 10 0 Merged branches | |
| 11 o 5 "(octopus merge fixup)" files: | |
| 12 |\ | |
| 13 | o 4 "Merged branches" files: file-branch2 | |
| 14 | |\ | |
| 15 o---+ 3 "Added brach2 file" files: file-branch2 | |
| 16 / / | |
| 17 | o 2 "Added parent file" files: file-parent | |
| 18 | | | |
| 19 o | 1 "Added branch1 file" files: file file-branch1 | |
| 20 |/ | |
| 21 o 0 "Initial add" files: file | |
| 22 | |
| 23 % manifest of tip | |
| 24 644 file | |
| 25 644 file-branch1 | |
| 26 644 file-branch2 | |
| 27 644 file-parent |