annotate tests/test-merge-prompt.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.

adding file1
adding file2
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head

# non-interactive merge
 local changed file1 which remote deleted
use (c)hanged version or (d)elete? c
remote changed file2 which local deleted
use (c)hanged version or leave (d)eleted? c
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
status:
M file2
C file1
file1:
1
changed
file2:
2
changed

# interactive merge
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 local changed file1 which remote deleted
use (c)hanged version or (d)elete? remote changed file2 which local deleted
use (c)hanged version or leave (d)eleted? 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
status:
file2: No such file or directory
C file1
file1:
1
changed
file2 does not exist

# interactive merge with bad input
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 local changed file1 which remote deleted
use (c)hanged version or (d)elete? unrecognized response
 local changed file1 which remote deleted
use (c)hanged version or (d)elete? unrecognized response
 local changed file1 which remote deleted
use (c)hanged version or (d)elete? remote changed file2 which local deleted
use (c)hanged version or leave (d)eleted? unrecognized response
remote changed file2 which local deleted
use (c)hanged version or leave (d)eleted? 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
status:
M file2
R file1
file1 does not exist
file2:
2
changed

# interactive merge with not enough input
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 local changed file1 which remote deleted
use (c)hanged version or (d)elete? remote changed file2 which local deleted
use (c)hanged version or leave (d)eleted? abort: response expected
failed
status:
file2: No such file or directory
C file1
file1:
1
changed
file2 does not exist