Mercurial > evolve
diff tests/test-split.t @ 3112:706402d70b3f mercurial-3.9
test-compat: merge with mercurial-4.0 branch
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 20 Oct 2017 18:44:52 +0200 |
parents | a456f55b3a6b a867d59ea97a |
children |
line wrap: on
line diff
--- a/tests/test-split.t Fri Oct 20 22:22:14 2017 +0200 +++ b/tests/test-split.t Fri Oct 20 18:44:52 2017 +0200 @@ -398,95 +398,3 @@ $ hg commit -m "empty" $ hg split 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - -Check that split keeps the right topic - - $ hg up -r tip - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - -Add topic to the hgrc - - $ echo "[extensions]" >> $HGRCPATH - $ echo "topic=$(echo $(dirname $TESTDIR))/hgext3rd/topic/" >> $HGRCPATH - $ hg topic mytopic - marked working directory as topic: mytopic - $ echo babar > babar - $ echo celeste > celeste - $ hg add babar celeste - $ hg commit -m "Works on mytopic" babar celeste --user victor - active topic 'mytopic' grew its first changeset - $ hg log -r . - changeset: 21:26f72cfaf036 - branch: new-branch - tag: tip - topic: mytopic - user: victor - date: Thu Jan 01 00:00:00 1970 +0000 - summary: Works on mytopic - - $ hg summary - parent: 21:26f72cfaf036 tip - Works on mytopic - branch: new-branch - commit: 2 unknown (clean) - update: (current) - phases: 9 draft - topic: mytopic - -Split it - - $ hg split -U << EOF - > Y - > Y - > N - > Y - > Y - > Y - > EOF - 0 files updated, 0 files merged, 2 files removed, 0 files unresolved - adding babar - adding celeste - diff --git a/babar b/babar - new file mode 100644 - examine changes to 'babar'? [Ynesfdaq?] Y - - @@ -0,0 +1,1 @@ - +babar - record change 1/2 to 'babar'? [Ynesfdaq?] Y - - diff --git a/celeste b/celeste - new file mode 100644 - examine changes to 'celeste'? [Ynesfdaq?] N - - Done splitting? [yN] Y - diff --git a/celeste b/celeste - new file mode 100644 - examine changes to 'celeste'? [Ynesfdaq?] Y - - @@ -0,0 +1,1 @@ - +celeste - record this change to 'celeste'? [Ynesfdaq?] Y - - no more change to split - -Check that the topic is still here - - $ hg log -r "tip~1::" - changeset: 22:addcf498f19e - branch: new-branch - topic: mytopic - parent: 20:fdb403258632 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: split7 - - changeset: 23:2532b288af61 - branch: new-branch - tag: tip - topic: mytopic - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: split8 - - $ hg topic - * mytopic (2 changesets)