Mercurial > hg
annotate tests/test-execute-bit.t @ 14485:610873cf064a
Make pull -u behave like pull && update
Previously, pull would not update if new branch heads were received,
whereas pull && update would move to the tipmost branch head.
Also change the "crosses branches" abort in merge.update from
"crosses branches (merge branches or use --check to force update)"
to
"crosses branches (merge branches or update --check to force update)"
since it can no longer assume the user is running hg update.
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Tue, 31 May 2011 11:52:22 -0700 |
parents | 9231c629ec10 |
children | 44bda93df90e |
rev | line source |
---|---|
12190
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
1 $ "$TESTDIR/hghave" execbit || exit 80 |
5490
bf2bb53e5d2b
See if execute bit is honoured when we go back in time
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
2 |
12190
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
3 $ hg init |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
4 $ echo a > a |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
5 $ hg ci -Am'not executable' |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
6 adding a |
5495
363ba35f55bd
test-execute-bit: skip if execute-bit is not supported
Patrick Mezard <pmezard@gmail.com>
parents:
5490
diff
changeset
|
7 |
12190
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
8 $ chmod +x a |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
9 $ hg ci -m'executable' |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
10 $ hg id |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
11 79abf14474dc tip |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
12 |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
13 Make sure we notice the change of mode if the cached size == -1: |
5490
bf2bb53e5d2b
See if execute bit is honoured when we go back in time
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
14 |
12190
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
15 $ hg rm a |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
16 $ hg revert -r 0 a |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
17 $ hg debugstate |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
18 n 0 -1 unset a |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
19 $ hg status |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
20 M a |
5490
bf2bb53e5d2b
See if execute bit is honoured when we go back in time
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
21 |
12190
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
22 $ hg up 0 |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
23 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
24 $ hg id |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
25 d69afc33ff8a |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
26 $ test -x a && echo executable -- bad || echo not executable -- good |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
27 not executable -- good |
6158
23ffe82615d8
repo.status: also compare flags for files in the lookup list.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5495
diff
changeset
|
28 |