Mercurial > hg
annotate tests/test-merge-types.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 | af5f099d932b |
children | ba5e508b5e92 |
rev | line source |
---|---|
5710 | 1 adding a |
2 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
5710
diff
changeset
|
3 created new head |
8753
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
7320
diff
changeset
|
4 searching for copies back to rev 1 |
5710 | 5 resolving manifests |
6 overwrite None partial False | |
7 ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c | |
7320
8dca507e56ce
ui: log non-interactive default response to stdout when verbose
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
6336
diff
changeset
|
8 conflicting flags for a |
8dca507e56ce
ui: log non-interactive default response to stdout when verbose
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
6336
diff
changeset
|
9 (n)one, e(x)ec or sym(l)ink? n |
5710 | 10 a: update permissions -> e |
11 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
12 (branch merge, don't forget to commit) | |
13 % symlink is local parent, executable is other | |
14 a has no flags (default for conflicts) | |
15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
8753
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
7320
diff
changeset
|
16 searching for copies back to rev 1 |
5710 | 17 resolving manifests |
18 overwrite None partial False | |
19 ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f | |
7320
8dca507e56ce
ui: log non-interactive default response to stdout when verbose
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
6336
diff
changeset
|
20 conflicting flags for a |
8dca507e56ce
ui: log non-interactive default response to stdout when verbose
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
6336
diff
changeset
|
21 (n)one, e(x)ec or sym(l)ink? n |
5710 | 22 a: remote is newer -> g |
23 getting a | |
24 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
25 (branch merge, don't forget to commit) | |
26 % symlink is other parent, executable is local | |
27 a has no flags (default for conflicts) |