Mercurial > hg

annotate tests/test-execute-bit.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 865c5be0f8df
children a964ab624385
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5490
bf2bb53e5d2b See if execute bit is honoured when we go back in time
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
1 adding a
6158
23ffe82615d8 repo.status: also compare flags for files in the lookup list.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 5490
diff changeset
2 79abf14474dc tip
23ffe82615d8 repo.status: also compare flags for files in the lookup list.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 5490
diff changeset
3 % make sure we notice the change of mode if the cached size == -1
23ffe82615d8 repo.status: also compare flags for files in the lookup list.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 5490
diff changeset
4 n 0 -1 unset a
23ffe82615d8 repo.status: also compare flags for files in the lookup list.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 5490
diff changeset
5 M a
7066
865c5be0f8df merge: fix bug going backwards for already reverted files (issue1303)
Matt Mackall <mpm@selenic.com>
parents: 6158
diff changeset
6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5490
bf2bb53e5d2b See if execute bit is honoured when we go back in time
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7 d69afc33ff8a
bf2bb53e5d2b See if execute bit is honoured when we go back in time
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8 not executable -- whew