Mercurial > evolve
comparison tests/test-evolve-stop-orphan.t @ 3930:d00f0c369bc7 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Thu, 02 Aug 2018 02:47:44 +0200 |
parents | 5ca297e78f2c 629558d09898 |
children | 537fd9a86c06 684cc3418ecd |
comparison
equal
deleted
inserted
replaced
3929:e709e3817d7e | 3930:d00f0c369bc7 |
---|---|
72 $ hg amend | 72 $ hg amend |
73 1 new orphan changesets | 73 1 new orphan changesets |
74 $ hg glog | 74 $ hg glog |
75 @ 5:cb6a2ab625bb added c | 75 @ 5:cb6a2ab625bb added c |
76 | () draft | 76 | () draft |
77 | * 4:c41c793e0ef1 added d | 77 | o 4:c41c793e0ef1 added d |
78 | | () draft | 78 | | () draft |
79 | x 3:ca1b80f7960a added c | 79 | x 3:ca1b80f7960a added c |
80 |/ () draft | 80 |/ () draft |
81 o 2:b1661037fa25 added b | 81 o 2:b1661037fa25 added b |
82 | () draft | 82 | () draft |
115 | 115 |
116 Checking graph | 116 Checking graph |
117 $ hg glog | 117 $ hg glog |
118 @ 5:cb6a2ab625bb added c | 118 @ 5:cb6a2ab625bb added c |
119 | () draft | 119 | () draft |
120 | * 4:c41c793e0ef1 added d | 120 | o 4:c41c793e0ef1 added d |
121 | | () draft | 121 | | () draft |
122 | x 3:ca1b80f7960a added c | 122 | x 3:ca1b80f7960a added c |
123 |/ () draft | 123 |/ () draft |
124 o 2:b1661037fa25 added b | 124 o 2:b1661037fa25 added b |
125 | () draft | 125 | () draft |
155 working directory is now at cb6a2ab625bb | 155 working directory is now at cb6a2ab625bb |
156 | 156 |
157 $ hg glog | 157 $ hg glog |
158 @ 5:cb6a2ab625bb added c | 158 @ 5:cb6a2ab625bb added c |
159 | () draft | 159 | () draft |
160 | * 4:c41c793e0ef1 added d | 160 | o 4:c41c793e0ef1 added d |
161 | | () draft | 161 | | () draft |
162 | x 3:ca1b80f7960a added c | 162 | x 3:ca1b80f7960a added c |
163 |/ () draft | 163 |/ () draft |
164 o 2:b1661037fa25 added b | 164 o 2:b1661037fa25 added b |
165 | () draft | 165 | () draft |
212 4 new orphan changesets | 212 4 new orphan changesets |
213 | 213 |
214 $ hg glog | 214 $ hg glog |
215 @ 7:21817cd42526 added hgignore | 215 @ 7:21817cd42526 added hgignore |
216 () draft | 216 () draft |
217 * 6:2a4e03d422e2 added d | 217 o 6:2a4e03d422e2 added d |
218 | () draft | 218 | () draft |
219 * 5:cb6a2ab625bb added c | 219 o 5:cb6a2ab625bb added c |
220 | () draft | 220 | () draft |
221 * 2:b1661037fa25 added b | 221 o 2:b1661037fa25 added b |
222 | () draft | 222 | () draft |
223 * 1:c7586e2a9264 added a | 223 o 1:c7586e2a9264 added a |
224 | () draft | 224 | () draft |
225 x 0:8fa14d15e168 added hgignore | 225 x 0:8fa14d15e168 added hgignore |
226 () draft | 226 () draft |
227 | 227 |
228 $ hg evolve --all | 228 $ hg evolve --all |
251 | () draft | 251 | () draft |
252 o 8:fd00db71edca added a | 252 o 8:fd00db71edca added a |
253 | () draft | 253 | () draft |
254 o 7:21817cd42526 added hgignore | 254 o 7:21817cd42526 added hgignore |
255 () draft | 255 () draft |
256 * 6:2a4e03d422e2 added d | 256 o 6:2a4e03d422e2 added d |
257 | () draft | 257 | () draft |
258 * 5:cb6a2ab625bb added c | 258 o 5:cb6a2ab625bb added c |
259 | () draft | 259 | () draft |
260 x 2:b1661037fa25 added b | 260 x 2:b1661037fa25 added b |
261 | () draft | 261 | () draft |
262 x 1:c7586e2a9264 added a | 262 x 1:c7586e2a9264 added a |
263 | () draft | 263 | () draft |
327 3 new orphan changesets | 327 3 new orphan changesets |
328 | 328 |
329 $ hg glog | 329 $ hg glog |
330 @ 12:a3cc2042492f added a | 330 @ 12:a3cc2042492f added a |
331 | () draft | 331 | () draft |
332 | * 11:cd0909a30222 added d | 332 | o 11:cd0909a30222 added d |
333 | | () draft | 333 | | () draft |
334 | * 10:cb1dd1086ef6 added c | 334 | o 10:cb1dd1086ef6 added c |
335 | | (b1) draft | 335 | | (b1) draft |
336 | * 9:aec285328e90 added b | 336 | o 9:aec285328e90 added b |
337 | | (b2) draft | 337 | | (b2) draft |
338 | x 8:fd00db71edca added a | 338 | x 8:fd00db71edca added a |
339 |/ () draft | 339 |/ () draft |
340 o 7:21817cd42526 added hgignore | 340 o 7:21817cd42526 added hgignore |
341 () draft | 341 () draft |
358 $ hg glog | 358 $ hg glog |
359 @ 13:a3f4b95da934 added b | 359 @ 13:a3f4b95da934 added b |
360 | (b2) draft | 360 | (b2) draft |
361 o 12:a3cc2042492f added a | 361 o 12:a3cc2042492f added a |
362 | () draft | 362 | () draft |
363 | * 11:cd0909a30222 added d | 363 | o 11:cd0909a30222 added d |
364 | | () draft | 364 | | () draft |
365 | * 10:cb1dd1086ef6 added c | 365 | o 10:cb1dd1086ef6 added c |
366 | | (b1) draft | 366 | | (b1) draft |
367 | x 9:aec285328e90 added b | 367 | x 9:aec285328e90 added b |
368 | | () draft | 368 | | () draft |
369 | x 8:fd00db71edca added a | 369 | x 8:fd00db71edca added a |
370 |/ () draft | 370 |/ () draft |