Mercurial > hg
annotate tests/test-revert-flags.t @ 12664:545ec1775021
merge: handle no file parent in backwards merge (issue2364)
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 09 Oct 2010 14:50:20 -0500 |
parents | 58a8105242a5 |
children | f2719b387380 |
rev | line source |
---|---|
12110
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
1 $ "$TESTDIR/hghave" execbit || exit 80 |
6030
d0dbae32517c
revert: revert clean files when only a change of flags is needed
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
2 |
12110
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
3 $ hg init repo |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
4 $ cd repo |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
5 $ echo foo > foo |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
6 $ chmod 644 foo |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
7 $ hg ci -qAm '644' |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
8 |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
9 $ chmod 755 foo |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
10 $ hg ci -qAm '755' |
6030
d0dbae32517c
revert: revert clean files when only a change of flags is needed
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
11 |
12110
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
12 reverting to rev 0 |
6030
d0dbae32517c
revert: revert clean files when only a change of flags is needed
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
13 |
12110
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
14 $ hg revert -a -r 0 |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
15 reverting foo |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
16 $ hg st |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
17 M foo |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
18 $ hg diff --git |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
19 diff --git a/foo b/foo |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
20 old mode 100755 |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
21 new mode 100644 |