author | Boris Feld <boris.feld@octobus.net> |
Fri, 04 Aug 2017 19:27:39 +0200 | |
changeset 33777 | d4b7496f7d0b |
parent 22046 | 7a9cbb315d84 |
child 34661 | eb586ed5d8ce |
permissions | -rw-r--r-- |
22046
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
18337
diff
changeset
|
1 |
#require execbit |
15442
db0340f4b507
tests: use 'hghave execbit' for tests that manipulate x bit in file system
Mads Kiilerich <mads@kiilerich.com>
parents:
14182
diff
changeset
|
2 |
|
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
3 |
$ umask 027 |
13956
ffb5c09ba822
tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents:
12156
diff
changeset
|
4 |
|
ffb5c09ba822
tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents:
12156
diff
changeset
|
5 |
$ hg init test1 |
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
6 |
$ cd test1 |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
7 |
$ touch a b |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
8 |
$ hg add a b |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11792
diff
changeset
|
9 |
$ hg ci -m "added a b" |
412 | 10 |
|
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
11 |
$ cd .. |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
12 |
$ hg clone test1 test3 |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
13 |
updating to branch default |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
14 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
13956
ffb5c09ba822
tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents:
12156
diff
changeset
|
15 |
|
ffb5c09ba822
tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents:
12156
diff
changeset
|
16 |
$ hg init test2 |
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
17 |
$ cd test2 |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
18 |
$ hg pull ../test1 |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
19 |
pulling from ../test1 |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
20 |
requesting all changes |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
21 |
adding changesets |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
22 |
adding manifests |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
23 |
adding file changes |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
24 |
added 1 changesets with 2 changes to 2 files |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
25 |
(run 'hg update' to get a working copy) |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
26 |
$ hg co |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
27 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
28 |
$ chmod +x a |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11792
diff
changeset
|
29 |
$ hg ci -m "chmod +x a" |
412 | 30 |
|
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
31 |
the changelog should mention file a: |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
32 |
|
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
33 |
$ hg tip --template '{files}\n' |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
34 |
a |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
35 |
|
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
36 |
$ cd ../test1 |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
37 |
$ echo 123 >>a |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11792
diff
changeset
|
38 |
$ hg ci -m "a updated" |
412 | 39 |
|
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
40 |
$ hg pull ../test2 |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
41 |
pulling from ../test2 |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
42 |
searching for changes |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
43 |
adding changesets |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
44 |
adding manifests |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
45 |
adding file changes |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
46 |
added 1 changesets with 0 changes to 0 files (+1 heads) |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
47 |
(run 'hg heads' to see heads, 'hg merge' to merge) |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
48 |
$ hg heads |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11792
diff
changeset
|
49 |
changeset: 2:7f4313b42a34 |
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
50 |
tag: tip |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11792
diff
changeset
|
51 |
parent: 0:22a449e20da5 |
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
52 |
user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11792
diff
changeset
|
53 |
date: Thu Jan 01 00:00:00 1970 +0000 |
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
54 |
summary: chmod +x a |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
55 |
|
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11792
diff
changeset
|
56 |
changeset: 1:c6ecefc45368 |
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
57 |
user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11792
diff
changeset
|
58 |
date: Thu Jan 01 00:00:00 1970 +0000 |
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
59 |
summary: a updated |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
60 |
|
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
61 |
$ hg history |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11792
diff
changeset
|
62 |
changeset: 2:7f4313b42a34 |
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
63 |
tag: tip |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11792
diff
changeset
|
64 |
parent: 0:22a449e20da5 |
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
65 |
user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11792
diff
changeset
|
66 |
date: Thu Jan 01 00:00:00 1970 +0000 |
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
67 |
summary: chmod +x a |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
68 |
|
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11792
diff
changeset
|
69 |
changeset: 1:c6ecefc45368 |
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
70 |
user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11792
diff
changeset
|
71 |
date: Thu Jan 01 00:00:00 1970 +0000 |
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
72 |
summary: a updated |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
73 |
|
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11792
diff
changeset
|
74 |
changeset: 0:22a449e20da5 |
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
75 |
user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11792
diff
changeset
|
76 |
date: Thu Jan 01 00:00:00 1970 +0000 |
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
77 |
summary: added a b |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
78 |
|
412 | 79 |
|
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
80 |
$ hg -v merge |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
81 |
resolving manifests |
18334
44bda93df90e
merge: changing the mode of a file is also an update
Mads Kiilerich <mads@kiilerich.com>
parents:
17132
diff
changeset
|
82 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
83 |
(branch merge, don't forget to commit) |
18337
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
84 |
$ cat a |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
85 |
123 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
86 |
$ [ -x a ] |
412 | 87 |
|
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
88 |
$ cd ../test3 |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
89 |
$ echo 123 >>b |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11792
diff
changeset
|
90 |
$ hg ci -m "b updated" |
412 | 91 |
|
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
92 |
$ hg pull ../test2 |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
93 |
pulling from ../test2 |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
94 |
searching for changes |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
95 |
adding changesets |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
96 |
adding manifests |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
97 |
adding file changes |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
98 |
added 1 changesets with 0 changes to 0 files (+1 heads) |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
99 |
(run 'hg heads' to see heads, 'hg merge' to merge) |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
100 |
$ hg heads |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11792
diff
changeset
|
101 |
changeset: 2:7f4313b42a34 |
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
102 |
tag: tip |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11792
diff
changeset
|
103 |
parent: 0:22a449e20da5 |
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
104 |
user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11792
diff
changeset
|
105 |
date: Thu Jan 01 00:00:00 1970 +0000 |
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
106 |
summary: chmod +x a |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
107 |
|
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11792
diff
changeset
|
108 |
changeset: 1:dc57ead75f79 |
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
109 |
user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11792
diff
changeset
|
110 |
date: Thu Jan 01 00:00:00 1970 +0000 |
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
111 |
summary: b updated |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
112 |
|
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
113 |
$ hg history |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11792
diff
changeset
|
114 |
changeset: 2:7f4313b42a34 |
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
115 |
tag: tip |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11792
diff
changeset
|
116 |
parent: 0:22a449e20da5 |
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
117 |
user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11792
diff
changeset
|
118 |
date: Thu Jan 01 00:00:00 1970 +0000 |
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
119 |
summary: chmod +x a |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
120 |
|
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11792
diff
changeset
|
121 |
changeset: 1:dc57ead75f79 |
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
122 |
user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11792
diff
changeset
|
123 |
date: Thu Jan 01 00:00:00 1970 +0000 |
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
124 |
summary: b updated |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
125 |
|
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11792
diff
changeset
|
126 |
changeset: 0:22a449e20da5 |
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
127 |
user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11792
diff
changeset
|
128 |
date: Thu Jan 01 00:00:00 1970 +0000 |
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
129 |
summary: added a b |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
130 |
|
3321
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2283
diff
changeset
|
131 |
|
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
132 |
$ hg -v merge |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
133 |
resolving manifests |
18334
44bda93df90e
merge: changing the mode of a file is also an update
Mads Kiilerich <mads@kiilerich.com>
parents:
17132
diff
changeset
|
134 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
11792
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
135 |
(branch merge, don't forget to commit) |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
136 |
|
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
137 |
$ ls -l ../test[123]/a > foo |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
138 |
$ cut -b 1-10 < foo |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
139 |
-rwxr-x--- |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
140 |
-rwxr-x--- |
47d2b4a5bd1e
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8523
diff
changeset
|
141 |
-rwxr-x--- |
3321
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2283
diff
changeset
|
142 |
|
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
13956
diff
changeset
|
143 |
$ hg debugindex a |
17132
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
144 |
rev offset length ..... linkrev nodeid p1 p2 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
145 |
0 0 0 ..... 0 b80de5d13875 000000000000 000000000000 (re) |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
13956
diff
changeset
|
146 |
$ hg debugindex -R ../test2 a |
17132
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
147 |
rev offset length ..... linkrev nodeid p1 p2 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
148 |
0 0 0 ..... 0 b80de5d13875 000000000000 000000000000 (re) |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
13956
diff
changeset
|
149 |
$ hg debugindex -R ../test1 a |
17132
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
150 |
rev offset length ..... linkrev nodeid p1 p2 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
151 |
0 0 0 ..... 0 b80de5d13875 000000000000 000000000000 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
152 |
1 0 5 ..... 1 7fe919cc0336 b80de5d13875 000000000000 (re) |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15442
diff
changeset
|
153 |
|
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15442
diff
changeset
|
154 |
$ cd .. |