Mercurial > evolve
comparison tests/test-split.t @ 4363:a2fdbece7ce1 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 22 Jan 2019 12:57:25 -0500 |
| parents | a71f2271ed76 e268f7fd7839 |
| children | f54bb6eaf5e6 |
comparison
equal
deleted
inserted
replaced
| 4362:8bd60e09dfb4 | 4363:a2fdbece7ce1 |
|---|---|
| 146 $ hg phase --rev 'desc("_a")' --draft --force | 146 $ hg phase --rev 'desc("_a")' --draft --force |
| 147 | 147 |
| 148 Split a revision specified with -r | 148 Split a revision specified with -r |
| 149 $ echo "change to b" >> _b | 149 $ echo "change to b" >> _b |
| 150 $ hg amend -m "_cprim" | 150 $ hg amend -m "_cprim" |
| 151 2 new orphan changesets | |
| 152 $ hg evolve --all | 151 $ hg evolve --all |
| 153 move:[5] split1 | 152 move:[5] split1 |
| 154 atop:[7] _cprim | 153 atop:[7] _cprim |
| 155 move:[6] split2 | 154 move:[6] split2 |
| 156 working directory is now at * (glob) | 155 working directory is now at * (glob) |
| 202 +_c | 201 +_c |
| 203 record change 2/2 to '_c'? [Ynesfdaq?] n | 202 record change 2/2 to '_c'? [Ynesfdaq?] n |
| 204 | 203 |
| 205 created new head | 204 created new head |
| 206 continue splitting? [Ycdq?] c | 205 continue splitting? [Ycdq?] c |
| 207 2 new orphan changesets | |
| 208 | 206 |
| 209 Stop before splitting the commit completely creates a commit with all the | 207 Stop before splitting the commit completely creates a commit with all the |
| 210 remaining changes | 208 remaining changes |
| 211 | 209 |
| 212 $ hg debugobsolete | 210 $ hg debugobsolete |
| 711 | 709 |
| 712 diff --git a/SPLIT2 b/SPLIT2 | 710 diff --git a/SPLIT2 b/SPLIT2 |
| 713 new file mode 100644 | 711 new file mode 100644 |
| 714 $ hg add SPLIT3 | 712 $ hg add SPLIT3 |
| 715 $ hg amend | 713 $ hg amend |
| 716 1 new orphan changesets | |
| 717 $ hg export | 714 $ hg export |
| 718 # HG changeset patch | 715 # HG changeset patch |
| 719 # User test | 716 # User test |
| 720 # Date 0 0 | 717 # Date 0 0 |
| 721 # Thu Jan 01 00:00:00 1970 +0000 | 718 # Thu Jan 01 00:00:00 1970 +0000 |
| 1047 @@ -0,0 +1,1 @@ | 1044 @@ -0,0 +1,1 @@ |
| 1048 +b | 1045 +b |
| 1049 record this change to 'b'? [Ynesfdaq?] y | 1046 record this change to 'b'? [Ynesfdaq?] y |
| 1050 | 1047 |
| 1051 no more change to split | 1048 no more change to split |
| 1052 1 new orphan changesets | |
| 1053 | 1049 |
| 1054 $ hg glog -p | 1050 $ hg glog -p |
| 1055 @ 4:5cf253fa63fa split2 (draft) | 1051 @ 4:5cf253fa63fa split2 (draft) |
| 1056 | diff --git a/b b/b | 1052 | diff --git a/b b/b |
| 1057 | new file mode 100644 | 1053 | new file mode 100644 |
| 1066 | --- /dev/null | 1062 | --- /dev/null |
| 1067 | +++ b/a | 1063 | +++ b/a |
| 1068 | @@ -0,0 +1,1 @@ | 1064 | @@ -0,0 +1,1 @@ |
| 1069 | +a | 1065 | +a |
| 1070 | | 1066 | |
| 1071 | * 2:ab6ca3ebca74 c (draft) | 1067 | o 2:ab6ca3ebca74 c (draft) |
| 1072 | | diff --git a/c b/c | 1068 | | diff --git a/c b/c |
| 1073 | | new file mode 100644 | 1069 | | new file mode 100644 |
| 1074 | | --- /dev/null | 1070 | | --- /dev/null |
| 1075 | | +++ b/c | 1071 | | +++ b/c |
| 1076 | | @@ -0,0 +1,1 @@ | 1072 | | @@ -0,0 +1,1 @@ |