383 marked working directory as branch new-branch |
383 marked working directory as branch new-branch |
384 (branches are permanent and global, did you want a bookmark?) |
384 (branches are permanent and global, did you want a bookmark?) |
385 $ hg commit -m "empty" |
385 $ hg commit -m "empty" |
386 $ hg split |
386 $ hg split |
387 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
387 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
388 |
|
389 Check that split keeps the right topic |
|
390 |
|
391 $ hg up -r tip |
|
392 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
393 |
|
394 Add topic to the hgrc |
|
395 |
|
396 $ echo "[extensions]" >> $HGRCPATH |
|
397 $ echo "topic=$(echo $(dirname $TESTDIR))/hgext3rd/topic/" >> $HGRCPATH |
|
398 $ hg topic mytopic |
|
399 $ echo babar > babar |
|
400 $ echo celeste > celeste |
|
401 $ hg add babar celeste |
|
402 $ hg commit -m "Works on mytopic" babar celeste |
|
403 $ hg summary |
|
404 parent: 21:615c369f47f0 tip |
|
405 Works on mytopic |
|
406 branch: new-branch |
|
407 commit: 2 unknown (clean) |
|
408 update: (current) |
|
409 phases: 9 draft |
|
410 topic: mytopic |
|
411 |
|
412 Split it |
|
413 |
|
414 $ hg split << EOF |
|
415 > Y |
|
416 > Y |
|
417 > N |
|
418 > Y |
|
419 > Y |
|
420 > Y |
|
421 > EOF |
|
422 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
423 adding babar |
|
424 adding celeste |
|
425 diff --git a/babar b/babar |
|
426 new file mode 100644 |
|
427 examine changes to 'babar'? [Ynesfdaq?] Y |
|
428 |
|
429 @@ -0,0 +1,1 @@ |
|
430 +babar |
|
431 record change 1/2 to 'babar'? [Ynesfdaq?] Y |
|
432 |
|
433 diff --git a/celeste b/celeste |
|
434 new file mode 100644 |
|
435 examine changes to 'celeste'? [Ynesfdaq?] N |
|
436 |
|
437 Done splitting? [yN] Y |
|
438 diff --git a/celeste b/celeste |
|
439 new file mode 100644 |
|
440 examine changes to 'celeste'? [Ynesfdaq?] Y |
|
441 |
|
442 @@ -0,0 +1,1 @@ |
|
443 +celeste |
|
444 record this change to 'celeste'? [Ynesfdaq?] Y |
|
445 |
|
446 no more change to split |
|
447 |
|
448 Check that the topic is still here |
|
449 |
|
450 $ hg log -r "tip~1::" |
|
451 changeset: 22:f879ab83f991 |
|
452 branch: new-branch |
|
453 topic: mytopic |
|
454 parent: 20:89e64a2c68b3 |
|
455 user: test |
|
456 date: Thu Jan 01 00:00:00 1970 +0000 |
|
457 summary: split7 |
|
458 |
|
459 changeset: 23:db75dbc1a3a6 |
|
460 branch: new-branch |
|
461 tag: tip |
|
462 topic: mytopic |
|
463 user: test |
|
464 date: Thu Jan 01 00:00:00 1970 +0000 |
|
465 summary: split8 |
|
466 |
|
467 $ hg topic |
|
468 * mytopic |