Mercurial > evolve

comparison tests/test-split.t @ 3105:f5d472b7e800 mercurial-4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: revert output changes related to temporary amend commit This backed out changeset 06844693bb21 and other related changes.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 20 Oct 2017 19:32:18 +0200
parents 13cafb250c1a
children a867d59ea97a
comparison
equal deleted inserted replaced
3104:3dd5a6f83f8b 3105:f5d472b7e800
38 $ mkcommit _d 38 $ mkcommit _d
39 $ echo "change to a" >> _a 39 $ echo "change to a" >> _a
40 $ hg amend 40 $ hg amend
41 $ hg debugobsolete 41 $ hg debugobsolete
42 1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (*) {'ef1': '8', 'user': 'test'} (glob) 42 1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (*) {'ef1': '8', 'user': 'test'} (glob)
43 06be89dfe2ae447383f30a2984933352757b6fb4 0 {1334a80b33c3f9873edab728fbbcf500eab61d2e} (*) {'ef1': '0', 'user': 'test'} (glob)
43 44
44 To create commits with the number of split 45 To create commits with the number of split
45 $ echo 0 > num 46 $ echo 0 > num
46 $ cat > editor.sh << '__EOF__' 47 $ cat > editor.sh << '__EOF__'
47 > NUM=$(cat num) 48 > NUM=$(cat num)
90 91
91 no more change to split 92 no more change to split
92 93
93 $ hg debugobsolete 94 $ hg debugobsolete
94 1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (*) {'ef1': '8', 'user': 'test'} (glob) 95 1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (*) {'ef1': '8', 'user': 'test'} (glob)
96 06be89dfe2ae447383f30a2984933352757b6fb4 0 {1334a80b33c3f9873edab728fbbcf500eab61d2e} (*) {'ef1': '0', 'user': 'test'} (glob)
95 d2fe56e71366c2c5376c89960c281395062c0619 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b 033b3f5ae73db67c10de938fb6f26b949aaef172 0 (*) {'ef1': '13', 'user': 'test'} (glob) 97 d2fe56e71366c2c5376c89960c281395062c0619 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b 033b3f5ae73db67c10de938fb6f26b949aaef172 0 (*) {'ef1': '13', 'user': 'test'} (glob)
96 $ hg log -G 98 $ hg log -G
97 @ changeset: 6:033b3f5ae73d 99 @ changeset: 7:033b3f5ae73d
98 | tag: tip 100 | tag: tip
99 | user: test 101 | user: test
100 | date: Thu Jan 01 00:00:00 1970 +0000 102 | date: Thu Jan 01 00:00:00 1970 +0000
101 | summary: split2 103 | summary: split2
102 | 104 |
103 o changeset: 5:2d8abdb827cd 105 o changeset: 6:2d8abdb827cd
104 | parent: 2:52149352b372 106 | parent: 2:52149352b372
105 | user: test 107 | user: test
106 | date: Thu Jan 01 00:00:00 1970 +0000 108 | date: Thu Jan 01 00:00:00 1970 +0000
107 | summary: split1 109 | summary: split1
108 | 110 |
146 Split a revision specified with -r 148 Split a revision specified with -r
147 $ echo "change to b" >> _b 149 $ echo "change to b" >> _b
148 $ hg amend -m "_cprim" 150 $ hg amend -m "_cprim"
149 2 new orphan changesets 151 2 new orphan changesets
150 $ hg evolve --all 152 $ hg evolve --all
151 move:[5] split1 153 move:[6] split1
152 atop:[7] _cprim 154 atop:[9] _cprim
153 move:[6] split2 155 move:[7] split2
154 atop:[8] split1 156 atop:[10] split1
155 working directory is now at * (glob) 157 working directory is now at * (glob)
156 $ hg log -r "desc(_cprim)" -v -p 158 $ hg log -r "desc(_cprim)" -v -p
157 changeset: 7:b434287e665c 159 changeset: 9:b434287e665c
158 parent: 1:37445b16603b 160 parent: 1:37445b16603b
159 user: other-test-user 161 user: other-test-user
160 date: Thu Jan 01 00:00:00 1970 +0000 162 date: Thu Jan 01 00:00:00 1970 +0000
161 files: _b _c 163 files: _b _c
162 description: 164 description:
207 Stop before splitting the commit completely creates a commit with all the 209 Stop before splitting the commit completely creates a commit with all the
208 remaining changes 210 remaining changes
209 211
210 $ hg debugobsolete 212 $ hg debugobsolete
211 1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (*) {'ef1': '8', 'user': 'test'} (glob) 213 1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (*) {'ef1': '8', 'user': 'test'} (glob)
214 06be89dfe2ae447383f30a2984933352757b6fb4 0 {1334a80b33c3f9873edab728fbbcf500eab61d2e} (*) {'ef1': '0', 'user': 'test'} (glob)
212 d2fe56e71366c2c5376c89960c281395062c0619 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b 033b3f5ae73db67c10de938fb6f26b949aaef172 0 (*) {'ef1': '13', 'user': 'test'} (glob) 215 d2fe56e71366c2c5376c89960c281395062c0619 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b 033b3f5ae73db67c10de938fb6f26b949aaef172 0 (*) {'ef1': '13', 'user': 'test'} (glob)
213 52149352b372d39b19127d5bd2d488b1b63f9f85 b434287e665ce757ee5463a965cb3d119ca9e893 0 (*) {'ef1': '9', 'user': 'test'} (glob) 216 52149352b372d39b19127d5bd2d488b1b63f9f85 b434287e665ce757ee5463a965cb3d119ca9e893 0 (*) {'ef1': '9', 'user': 'test'} (glob)
217 7a4fc25a48a5797bb069563854455aecf738d8f2 0 {52149352b372d39b19127d5bd2d488b1b63f9f85} (*) {'ef1': '0', 'user': 'test'} (glob)
214 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b e2b4afde39803bd42bb1374b230fca1b1e8cc868 0 (*) {'ef1': '4', 'user': 'test'} (glob) 218 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b e2b4afde39803bd42bb1374b230fca1b1e8cc868 0 (*) {'ef1': '4', 'user': 'test'} (glob)
215 033b3f5ae73db67c10de938fb6f26b949aaef172 bb5e4f6020c74e7961a51fda635ea9df9b04dda8 0 (*) {'ef1': '4', 'user': 'test'} (glob) 219 033b3f5ae73db67c10de938fb6f26b949aaef172 bb5e4f6020c74e7961a51fda635ea9df9b04dda8 0 (*) {'ef1': '4', 'user': 'test'} (glob)
216 b434287e665ce757ee5463a965cb3d119ca9e893 ead2066d1dbf14833fe1069df1b735e4e9468c40 1188c4216eba37f18a1de6558564601d00ff2143 0 (*) {'ef1': '13', 'user': 'test'} (glob) 220 b434287e665ce757ee5463a965cb3d119ca9e893 ead2066d1dbf14833fe1069df1b735e4e9468c40 1188c4216eba37f18a1de6558564601d00ff2143 0 (*) {'ef1': '13', 'user': 'test'} (glob)
217 $ hg evolve --all 221 $ hg evolve --all
218 move:[8] split1 222 move:[10] split1
219 atop:[11] split4 223 atop:[13] split4
220 move:[9] split2 224 move:[11] split2
221 atop:[12] split1 225 atop:[14] split1
222 working directory is now at d74c6715e706 226 working directory is now at d74c6715e706
223 $ hg log -G 227 $ hg log -G
224 @ changeset: 13:d74c6715e706 228 @ changeset: 15:d74c6715e706
225 | tag: tip 229 | tag: tip
226 | user: test 230 | user: test
227 | date: Thu Jan 01 00:00:00 1970 +0000 231 | date: Thu Jan 01 00:00:00 1970 +0000
228 | summary: split2 232 | summary: split2
229 | 233 |
230 o changeset: 12:3f134f739075 234 o changeset: 14:3f134f739075
231 | user: test 235 | user: test
232 | date: Thu Jan 01 00:00:00 1970 +0000 236 | date: Thu Jan 01 00:00:00 1970 +0000
233 | summary: split1 237 | summary: split1
234 | 238 |
235 o changeset: 11:1188c4216eba 239 o changeset: 13:1188c4216eba
236 | user: other-test-user 240 | user: other-test-user
237 | date: Thu Jan 01 00:00:00 1970 +0000 241 | date: Thu Jan 01 00:00:00 1970 +0000
238 | summary: split4 242 | summary: split4
239 | 243 |
240 o changeset: 10:ead2066d1dbf 244 o changeset: 12:ead2066d1dbf
241 | parent: 1:37445b16603b 245 | parent: 1:37445b16603b
242 | user: other-test-user 246 | user: other-test-user
243 | date: Thu Jan 01 00:00:00 1970 +0000 247 | date: Thu Jan 01 00:00:00 1970 +0000
244 | summary: split3 248 | summary: split3
245 | 249 |
259 $ hg book bookA 263 $ hg book bookA
260 $ hg book bookB 264 $ hg book bookB
261 $ echo "changetofilea" > _a 265 $ echo "changetofilea" > _a
262 $ hg amend 266 $ hg amend
263 $ hg book 267 $ hg book
264 bookA 14:7a6b35779b85 268 bookA 17:7a6b35779b85
265 * bookB 14:7a6b35779b85 269 * bookB 17:7a6b35779b85
266 $ hg log -G -r "3f134f739075::" 270 $ hg log -G -r "14::"
267 @ changeset: 14:7a6b35779b85 271 @ changeset: 17:7a6b35779b85
268 | bookmark: bookA 272 | bookmark: bookA
269 | bookmark: bookB 273 | bookmark: bookB
270 | tag: tip 274 | tag: tip
271 | parent: 12:3f134f739075 275 | parent: 14:3f134f739075
272 | user: test 276 | user: test
273 | date: Thu Jan 01 00:00:00 1970 +0000 277 | date: Thu Jan 01 00:00:00 1970 +0000
274 | summary: split2 278 | summary: split2
275 | 279 |
276 o changeset: 12:3f134f739075 280 o changeset: 14:3f134f739075
277 | user: test 281 | user: test
278 ~ date: Thu Jan 01 00:00:00 1970 +0000 282 ~ date: Thu Jan 01 00:00:00 1970 +0000
279 summary: split1 283 summary: split1
280 284
281 $ hg split --user victor <<EOF 285 $ hg split --user victor <<EOF
302 new file mode 100644 306 new file mode 100644
303 examine changes to '_d'? [Ynesfdaq?] n 307 examine changes to '_d'? [Ynesfdaq?] n
304 308
305 created new head 309 created new head
306 Done splitting? [yN] y 310 Done splitting? [yN] y
307 $ hg log -G -r "3f134f739075::" 311 $ hg log -G -r "14::"
308 @ changeset: 16:452a26648478 312 @ changeset: 19:452a26648478
309 | bookmark: bookA 313 | bookmark: bookA
310 | bookmark: bookB 314 | bookmark: bookB
311 | tag: tip 315 | tag: tip
312 | user: victor 316 | user: victor
313 | date: Thu Jan 01 00:00:00 1970 +0000 317 | date: Thu Jan 01 00:00:00 1970 +0000
314 | summary: split6 318 | summary: split6
315 | 319 |
316 o changeset: 15:1315679b77dc 320 o changeset: 18:1315679b77dc
317 | parent: 12:3f134f739075 321 | parent: 14:3f134f739075
318 | user: victor 322 | user: victor
319 | date: Thu Jan 01 00:00:00 1970 +0000 323 | date: Thu Jan 01 00:00:00 1970 +0000
320 | summary: split5 324 | summary: split5
321 | 325 |
322 o changeset: 12:3f134f739075 326 o changeset: 14:3f134f739075
323 | user: test 327 | user: test
324 ~ date: Thu Jan 01 00:00:00 1970 +0000 328 ~ date: Thu Jan 01 00:00:00 1970 +0000
325 summary: split1 329 summary: split1
326 330
327 $ hg book 331 $ hg book
328 bookA 16:452a26648478 332 bookA 19:452a26648478
329 * bookB 16:452a26648478 333 * bookB 19:452a26648478
330 334
331 Lastest revision is selected if multiple are given to -r 335 Lastest revision is selected if multiple are given to -r
332 $ hg split -r "desc(_a)::" 336 $ hg split -r "desc(_a)::"
333 (leaving bookmark bookB) 337 (leaving bookmark bookB)
334 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 338 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
410 $ echo celeste > celeste 414 $ echo celeste > celeste
411 $ hg add babar celeste 415 $ hg add babar celeste
412 $ hg commit -m "Works on mytopic" babar celeste --user victor 416 $ hg commit -m "Works on mytopic" babar celeste --user victor
413 active topic 'mytopic' grew its first changeset 417 active topic 'mytopic' grew its first changeset
414 $ hg log -r . 418 $ hg log -r .
415 changeset: 18:26f72cfaf036 419 changeset: 21:26f72cfaf036
416 branch: new-branch 420 branch: new-branch
417 tag: tip 421 tag: tip
418 topic: mytopic 422 topic: mytopic
419 user: victor 423 user: victor
420 date: Thu Jan 01 00:00:00 1970 +0000 424 date: Thu Jan 01 00:00:00 1970 +0000
421 summary: Works on mytopic 425 summary: Works on mytopic
422 426
423 $ hg summary 427 $ hg summary
424 parent: 18:26f72cfaf036 tip 428 parent: 21:26f72cfaf036 tip
425 Works on mytopic 429 Works on mytopic
426 branch: new-branch 430 branch: new-branch
427 commit: 2 unknown (clean) 431 commit: 2 unknown (clean)
428 update: (current) 432 update: (current)
429 phases: 9 draft 433 phases: 9 draft
466 no more change to split 470 no more change to split
467 471
468 Check that the topic is still here 472 Check that the topic is still here
469 473
470 $ hg log -r "tip~1::" 474 $ hg log -r "tip~1::"
471 changeset: 19:addcf498f19e 475 changeset: 22:addcf498f19e
472 branch: new-branch 476 branch: new-branch
473 topic: mytopic 477 topic: mytopic
474 parent: 17:fdb403258632 478 parent: 20:fdb403258632
475 user: test 479 user: test
476 date: Thu Jan 01 00:00:00 1970 +0000 480 date: Thu Jan 01 00:00:00 1970 +0000
477 summary: split7 481 summary: split7
478 482
479 changeset: 20:2532b288af61 483 changeset: 23:2532b288af61
480 branch: new-branch 484 branch: new-branch
481 tag: tip 485 tag: tip
482 topic: mytopic 486 topic: mytopic
483 user: test 487 user: test
484 date: Thu Jan 01 00:00:00 1970 +0000 488 date: Thu Jan 01 00:00:00 1970 +0000