Show More
@@ -14,15 +14,15 b'' | |||||
14 | $ hg add a |
|
14 | $ hg add a | |
15 | $ hg ci -u test -d '0 0' -m '0' |
|
15 | $ hg ci -u test -d '0 0' -m '0' | |
16 | $ echo '1' >a |
|
16 | $ echo '1' >a | |
17 |
$ hg ci -u test -d ' |
|
17 | $ hg ci -u test -d '1 0' -m '1' | |
18 |
|
18 | |||
19 | branch 2-3 |
|
19 | branch 2-3 | |
20 |
|
20 | |||
21 | $ echo '2' >b |
|
21 | $ echo '2' >b | |
22 | $ hg add b |
|
22 | $ hg add b | |
23 |
$ hg ci -u test -d ' |
|
23 | $ hg ci -u test -d '2 0' -m '2' | |
24 | $ echo '3' >b |
|
24 | $ echo '3' >b | |
25 |
$ hg ci -u test -d ' |
|
25 | $ hg ci -u test -d '3 0' -m '3' | |
26 |
|
26 | |||
27 | branch 4-8 |
|
27 | branch 4-8 | |
28 |
|
28 | |||
@@ -30,30 +30,30 b' branch 4-8' | |||||
30 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
30 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
31 | $ echo '4' >c |
|
31 | $ echo '4' >c | |
32 | $ hg add c |
|
32 | $ hg add c | |
33 |
$ hg ci -u test -d ' |
|
33 | $ hg ci -u test -d '4 0' -m '4' | |
34 | created new head |
|
34 | created new head | |
35 | $ echo '5' >c |
|
35 | $ echo '5' >c | |
36 |
$ hg ci -u test -d ' |
|
36 | $ hg ci -u test -d '5 0' -m '5' | |
37 | $ echo '6' >c |
|
37 | $ echo '6' >c | |
38 |
$ hg ci -u test -d ' |
|
38 | $ hg ci -u test -d '6 0' -m '6' | |
39 | $ echo '7' >c |
|
39 | $ echo '7' >c | |
40 |
$ hg ci -u test -d ' |
|
40 | $ hg ci -u test -d '7 0' -m '7' | |
41 | $ echo '8' >c |
|
41 | $ echo '8' >c | |
42 |
$ hg ci -u test -d ' |
|
42 | $ hg ci -u test -d '8 0' -m '8' | |
43 |
|
43 | |||
44 | merge |
|
44 | merge | |
45 |
|
45 | |||
46 | $ hg merge -r 3 |
|
46 | $ hg merge -r 3 | |
47 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
47 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
48 | (branch merge, don't forget to commit) |
|
48 | (branch merge, don't forget to commit) | |
49 |
$ hg ci -u test -d '0 |
|
49 | $ hg ci -u test -d '9 0' -m '9=8+3' | |
50 |
|
50 | |||
51 | $ echo '10' >a |
|
51 | $ echo '10' >a | |
52 |
$ hg ci -u test -d '0 |
|
52 | $ hg ci -u test -d '10 0' -m '10' | |
53 | $ echo '11' >a |
|
53 | $ echo '11' >a | |
54 |
$ hg ci -u test -d '0 |
|
54 | $ hg ci -u test -d '11 0' -m '11' | |
55 | $ echo '12' >a |
|
55 | $ echo '12' >a | |
56 |
$ hg ci -u test -d '0 |
|
56 | $ hg ci -u test -d '12 0' -m '12' | |
57 |
|
57 | |||
58 | unrelated branch |
|
58 | unrelated branch | |
59 |
|
59 | |||
@@ -61,10 +61,10 b' unrelated branch' | |||||
61 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
61 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
62 | $ echo '13' >d |
|
62 | $ echo '13' >d | |
63 | $ hg add d |
|
63 | $ hg add d | |
64 |
$ hg ci -u test -d '0 |
|
64 | $ hg ci -u test -d '13 0' -m '13' | |
65 | created new head |
|
65 | created new head | |
66 | $ echo '14' >d |
|
66 | $ echo '14' >d | |
67 |
$ hg ci -u test -d '0 |
|
67 | $ hg ci -u test -d '14 0' -m '14' | |
68 |
|
68 | |||
69 | mark changesets |
|
69 | mark changesets | |
70 |
|
70 | |||
@@ -72,140 +72,140 b' mark changesets' | |||||
72 | $ hg bisect --good 4 |
|
72 | $ hg bisect --good 4 | |
73 | $ hg bisect --good 6 |
|
73 | $ hg bisect --good 6 | |
74 | $ hg bisect --bad 12 |
|
74 | $ hg bisect --bad 12 | |
75 |
Testing changeset 9: |
|
75 | Testing changeset 9:2197c557e14c (6 changesets remaining, ~2 tests) | |
76 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
76 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
77 | $ hg bisect --bad 10 |
|
77 | $ hg bisect --bad 10 | |
78 |
Testing changeset 8: |
|
78 | Testing changeset 8:e74a86251f58 (4 changesets remaining, ~2 tests) | |
79 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
79 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
80 | $ hg bisect --skip 7 |
|
80 | $ hg bisect --skip 7 | |
81 |
Testing changeset 8: |
|
81 | Testing changeset 8:e74a86251f58 (4 changesets remaining, ~2 tests) | |
82 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
82 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
83 |
|
83 | |||
84 | test template |
|
84 | test template | |
85 |
|
85 | |||
86 | $ hg log --template '{rev}:{node|short} {bisect}\n' |
|
86 | $ hg log --template '{rev}:{node|short} {bisect}\n' | |
87 | 14:cecd84203acc |
|
87 | 14:cbf2f3105bbf | |
88 | 13:86f7c8cdb6df |
|
88 | 13:e07efca37c43 | |
89 |
12: |
|
89 | 12:98c6b56349c0 bad | |
90 |
11: |
|
90 | 11:03f491376e63 bad (implicit) | |
91 | 10:b097cef2be03 bad |
|
91 | 10:c012b15e2409 bad | |
92 |
9: |
|
92 | 9:2197c557e14c untested | |
93 |
8: |
|
93 | 8:e74a86251f58 untested | |
94 | 7:577e237a73bd skipped |
|
94 | 7:a5f87041c899 skipped | |
95 | 6:e597fa2707c5 good |
|
95 | 6:7d997bedcd8d good | |
96 |
5: |
|
96 | 5:2dd1875f1028 good (implicit) | |
97 | 4:da6b357259d7 good |
|
97 | 4:2a1daef14cd4 good | |
98 |
3: |
|
98 | 3:8417d459b90c ignored | |
99 | 2:b1ad1b6bcc5c ignored |
|
99 | 2:e1355ee1f23e ignored | |
100 |
1: |
|
100 | 1:ce7c85e06a9f good (implicit) | |
101 | 0:b4e73ffab476 good (implicit) |
|
101 | 0:b4e73ffab476 good (implicit) | |
102 | $ hg log --template '{bisect|shortbisect} {rev}:{node|short}\n' |
|
102 | $ hg log --template '{bisect|shortbisect} {rev}:{node|short}\n' | |
103 | 14:cecd84203acc |
|
103 | 14:cbf2f3105bbf | |
104 | 13:86f7c8cdb6df |
|
104 | 13:e07efca37c43 | |
105 |
B 12: |
|
105 | B 12:98c6b56349c0 | |
106 | B 11:5c3eb122d29c |
|
106 | B 11:03f491376e63 | |
107 | B 10:b097cef2be03 |
|
107 | B 10:c012b15e2409 | |
108 | U 9:8bcbdb072033 |
|
108 | U 9:2197c557e14c | |
109 | U 8:3cd112f87d77 |
|
109 | U 8:e74a86251f58 | |
110 | S 7:577e237a73bd |
|
110 | S 7:a5f87041c899 | |
111 | G 6:e597fa2707c5 |
|
111 | G 6:7d997bedcd8d | |
112 | G 5:b9cea37a76bc |
|
112 | G 5:2dd1875f1028 | |
113 | G 4:da6b357259d7 |
|
113 | G 4:2a1daef14cd4 | |
114 | I 3:e7f031aee8ca |
|
114 | I 3:8417d459b90c | |
115 | I 2:b1ad1b6bcc5c |
|
115 | I 2:e1355ee1f23e | |
116 | G 1:37f42ae8b45e |
|
116 | G 1:ce7c85e06a9f | |
117 | G 0:b4e73ffab476 |
|
117 | G 0:b4e73ffab476 | |
118 |
|
118 | |||
119 | test style |
|
119 | test style | |
120 |
|
120 | |||
121 | $ hg log --style bisect |
|
121 | $ hg log --style bisect | |
122 |
changeset: 14:c |
|
122 | changeset: 14:cbf2f3105bbf | |
123 | bisect: |
|
123 | bisect: | |
124 | tag: tip |
|
124 | tag: tip | |
125 | user: test |
|
125 | user: test | |
126 |
date: |
|
126 | date: Thu Jan 01 00:00:14 1970 +0000 | |
127 | summary: 14 |
|
127 | summary: 14 | |
128 |
|
128 | |||
129 |
changeset: 13: |
|
129 | changeset: 13:e07efca37c43 | |
130 | bisect: |
|
130 | bisect: | |
131 |
parent: 3: |
|
131 | parent: 3:8417d459b90c | |
132 | user: test |
|
132 | user: test | |
133 |
date: |
|
133 | date: Thu Jan 01 00:00:13 1970 +0000 | |
134 | summary: 13 |
|
134 | summary: 13 | |
135 |
|
135 | |||
136 |
changeset: 12: |
|
136 | changeset: 12:98c6b56349c0 | |
137 | bisect: bad |
|
137 | bisect: bad | |
138 | user: test |
|
138 | user: test | |
139 |
date: |
|
139 | date: Thu Jan 01 00:00:12 1970 +0000 | |
140 | summary: 12 |
|
140 | summary: 12 | |
141 |
|
141 | |||
142 |
changeset: 11: |
|
142 | changeset: 11:03f491376e63 | |
143 | bisect: bad (implicit) |
|
143 | bisect: bad (implicit) | |
144 | user: test |
|
144 | user: test | |
145 |
date: |
|
145 | date: Thu Jan 01 00:00:11 1970 +0000 | |
146 | summary: 11 |
|
146 | summary: 11 | |
147 |
|
147 | |||
148 |
changeset: 10: |
|
148 | changeset: 10:c012b15e2409 | |
149 | bisect: bad |
|
149 | bisect: bad | |
150 | user: test |
|
150 | user: test | |
151 |
date: |
|
151 | date: Thu Jan 01 00:00:10 1970 +0000 | |
152 | summary: 10 |
|
152 | summary: 10 | |
153 |
|
153 | |||
154 |
changeset: 9: |
|
154 | changeset: 9:2197c557e14c | |
155 | bisect: untested |
|
155 | bisect: untested | |
156 |
parent: 8: |
|
156 | parent: 8:e74a86251f58 | |
157 |
parent: 3: |
|
157 | parent: 3:8417d459b90c | |
158 | user: test |
|
158 | user: test | |
159 |
date: |
|
159 | date: Thu Jan 01 00:00:09 1970 +0000 | |
160 | summary: 9=8+3 |
|
160 | summary: 9=8+3 | |
161 |
|
161 | |||
162 |
changeset: 8: |
|
162 | changeset: 8:e74a86251f58 | |
163 | bisect: untested |
|
163 | bisect: untested | |
164 | user: test |
|
164 | user: test | |
165 |
date: |
|
165 | date: Thu Jan 01 00:00:08 1970 +0000 | |
166 | summary: 8 |
|
166 | summary: 8 | |
167 |
|
167 | |||
168 |
changeset: 7: |
|
168 | changeset: 7:a5f87041c899 | |
169 | bisect: skipped |
|
169 | bisect: skipped | |
170 | user: test |
|
170 | user: test | |
171 |
date: |
|
171 | date: Thu Jan 01 00:00:07 1970 +0000 | |
172 | summary: 7 |
|
172 | summary: 7 | |
173 |
|
173 | |||
174 |
changeset: 6: |
|
174 | changeset: 6:7d997bedcd8d | |
175 | bisect: good |
|
175 | bisect: good | |
176 | user: test |
|
176 | user: test | |
177 |
date: |
|
177 | date: Thu Jan 01 00:00:06 1970 +0000 | |
178 | summary: 6 |
|
178 | summary: 6 | |
179 |
|
179 | |||
180 |
changeset: 5: |
|
180 | changeset: 5:2dd1875f1028 | |
181 | bisect: good (implicit) |
|
181 | bisect: good (implicit) | |
182 | user: test |
|
182 | user: test | |
183 |
date: |
|
183 | date: Thu Jan 01 00:00:05 1970 +0000 | |
184 | summary: 5 |
|
184 | summary: 5 | |
185 |
|
185 | |||
186 |
changeset: 4: |
|
186 | changeset: 4:2a1daef14cd4 | |
187 | bisect: good |
|
187 | bisect: good | |
188 |
parent: 1: |
|
188 | parent: 1:ce7c85e06a9f | |
189 | user: test |
|
189 | user: test | |
190 |
date: |
|
190 | date: Thu Jan 01 00:00:04 1970 +0000 | |
191 | summary: 4 |
|
191 | summary: 4 | |
192 |
|
192 | |||
193 |
changeset: 3: |
|
193 | changeset: 3:8417d459b90c | |
194 | bisect: ignored |
|
194 | bisect: ignored | |
195 | user: test |
|
195 | user: test | |
196 |
date: |
|
196 | date: Thu Jan 01 00:00:03 1970 +0000 | |
197 | summary: 3 |
|
197 | summary: 3 | |
198 |
|
198 | |||
199 |
changeset: 2: |
|
199 | changeset: 2:e1355ee1f23e | |
200 | bisect: ignored |
|
200 | bisect: ignored | |
201 | user: test |
|
201 | user: test | |
202 |
date: |
|
202 | date: Thu Jan 01 00:00:02 1970 +0000 | |
203 | summary: 2 |
|
203 | summary: 2 | |
204 |
|
204 | |||
205 |
changeset: 1: |
|
205 | changeset: 1:ce7c85e06a9f | |
206 | bisect: good (implicit) |
|
206 | bisect: good (implicit) | |
207 | user: test |
|
207 | user: test | |
208 |
date: |
|
208 | date: Thu Jan 01 00:00:01 1970 +0000 | |
209 | summary: 1 |
|
209 | summary: 1 | |
210 |
|
210 | |||
211 | changeset: 0:b4e73ffab476 |
|
211 | changeset: 0:b4e73ffab476 | |
@@ -215,18 +215,18 b' test style' | |||||
215 | summary: 0 |
|
215 | summary: 0 | |
216 |
|
216 | |||
217 | $ hg log --quiet --style bisect |
|
217 | $ hg log --quiet --style bisect | |
218 | 14:cecd84203acc |
|
218 | 14:cbf2f3105bbf | |
219 | 13:86f7c8cdb6df |
|
219 | 13:e07efca37c43 | |
220 |
B 12: |
|
220 | B 12:98c6b56349c0 | |
221 | B 11:5c3eb122d29c |
|
221 | B 11:03f491376e63 | |
222 | B 10:b097cef2be03 |
|
222 | B 10:c012b15e2409 | |
223 | U 9:8bcbdb072033 |
|
223 | U 9:2197c557e14c | |
224 | U 8:3cd112f87d77 |
|
224 | U 8:e74a86251f58 | |
225 | S 7:577e237a73bd |
|
225 | S 7:a5f87041c899 | |
226 | G 6:e597fa2707c5 |
|
226 | G 6:7d997bedcd8d | |
227 | G 5:b9cea37a76bc |
|
227 | G 5:2dd1875f1028 | |
228 | G 4:da6b357259d7 |
|
228 | G 4:2a1daef14cd4 | |
229 | I 3:e7f031aee8ca |
|
229 | I 3:8417d459b90c | |
230 | I 2:b1ad1b6bcc5c |
|
230 | I 2:e1355ee1f23e | |
231 | G 1:37f42ae8b45e |
|
231 | G 1:ce7c85e06a9f | |
232 | G 0:b4e73ffab476 |
|
232 | G 0:b4e73ffab476 |
General Comments 0
You need to be logged in to leave comments.
Login now