Mercurial > evolve
diff tests/test-split.t @ 4516:f54bb6eaf5e6 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Thu, 11 Apr 2019 22:44:53 +0200 |
parents | a2fdbece7ce1 e4fc3af2d0a9 |
children | 0eb80259f9cb |
line wrap: on
line diff
--- a/tests/test-split.t Thu Apr 11 22:42:14 2019 +0200 +++ b/tests/test-split.t Thu Apr 11 22:44:53 2019 +0200 @@ -150,7 +150,6 @@ Split a revision specified with -r $ echo "change to b" >> _b $ hg amend -m "_cprim" - 2 new orphan changesets $ hg evolve --all move:[5] split1 atop:[7] _cprim @@ -206,7 +205,6 @@ created new head continue splitting? [Ycdq?] c - 2 new orphan changesets Stop before splitting the commit completely creates a commit with all the remaining changes @@ -715,7 +713,6 @@ new file mode 100644 $ hg add SPLIT3 $ hg amend - 1 new orphan changesets $ hg export # HG changeset patch # User test @@ -1051,7 +1048,6 @@ record this change to 'b'? [Ynesfdaq?] y no more change to split - 1 new orphan changesets $ hg glog -p @ 4:5cf253fa63fa split2 (draft) @@ -1070,7 +1066,7 @@ | @@ -0,0 +1,1 @@ | +a | - | * 2:ab6ca3ebca74 c (draft) + | o 2:ab6ca3ebca74 c (draft) | | diff --git a/c b/c | | new file mode 100644 | | --- /dev/null