Mercurial > hg

annotate tests/test-issue352.out @ 7785:660c8dd44060

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-merge-tool: Make sure no hgmerge can be found in $PATH The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH before it falls back to use internal merge. This fixes the test for this fallback to be tolerant to existing hgmerges.
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 10 Feb 2009 22:47:38 +0100
parents 09847b90beae
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3607
f4c9bb4ad7b1 issue352: disallow '\n' and '\r' in filenames (dirstate and manifest)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
1 adding he llo
6138
09847b90beae Report filenames with disallowed characters as suggested by Mika Eloranta
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4186
diff changeset
2 abort: '\n' and '\r' disallowed in filenames: 'he\rllo'
3607
f4c9bb4ad7b1 issue352: disallow '\n' and '\r' in filenames (dirstate and manifest)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
3 adding he llo
6138
09847b90beae Report filenames with disallowed characters as suggested by Mika Eloranta
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4186
diff changeset
4 abort: '\n' and '\r' disallowed in filenames: 'he\rllo'
4186
08d31e43592a Leave normalization of patterns to util._matcher
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3607
diff changeset
5 adding hell
08d31e43592a Leave normalization of patterns to util._matcher
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3607
diff changeset
6 o
6138
09847b90beae Report filenames with disallowed characters as suggested by Mika Eloranta
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4186
diff changeset
7 abort: '\n' and '\r' disallowed in filenames: 'hell\no'
4186
08d31e43592a Leave normalization of patterns to util._matcher
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3607
diff changeset
8 adding hell
3607
f4c9bb4ad7b1 issue352: disallow '\n' and '\r' in filenames (dirstate and manifest)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
9 o
6138
09847b90beae Report filenames with disallowed characters as suggested by Mika Eloranta
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4186
diff changeset
10 abort: '\n' and '\r' disallowed in filenames: 'hell\no'
4186
08d31e43592a Leave normalization of patterns to util._matcher
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3607
diff changeset
11 f he llo he llo
08d31e43592a Leave normalization of patterns to util._matcher
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3607
diff changeset
12 f hell
08d31e43592a Leave normalization of patterns to util._matcher
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3607
diff changeset
13 o hell
08d31e43592a Leave normalization of patterns to util._matcher
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3607
diff changeset
14 o