Mercurial > evolve
comparison tests/test-evolve-orphan-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 b58e45aa9be2 |
| children | 79bc0f1a832e |
comparison
equal
deleted
inserted
replaced
| 4514:ef1c322c389d | 4516:f54bb6eaf5e6 |
|---|---|
| 58 new file mode 100644 | 58 new file mode 100644 |
| 59 examine changes to 'b'? [Ynesfdaq?] n | 59 examine changes to 'b'? [Ynesfdaq?] n |
| 60 | 60 |
| 61 created new head | 61 created new head |
| 62 continue splitting? [Ycdq?] c | 62 continue splitting? [Ycdq?] c |
| 63 1 new orphan changesets | |
| 64 | 63 |
| 65 $ hg glog | 64 $ hg glog |
| 66 @ 4:8b179cffc81c added a and b | 65 @ 4:8b179cffc81c added a and b |
| 67 | () draft | 66 | () draft |
| 68 o 3:bd3735d4dab0 added a and b | 67 o 3:bd3735d4dab0 added a and b |
| 69 | () draft | 68 | () draft |
| 70 | * 2:86e1ebf1ca61 added c | 69 | o 2:86e1ebf1ca61 added c |
| 71 | | () draft | 70 | | () draft |
| 72 | x 1:d0ddb614efbd added a and b | 71 | x 1:d0ddb614efbd added a and b |
| 73 |/ () draft | 72 |/ () draft |
| 74 o 0:8fa14d15e168 added hgignore | 73 o 0:8fa14d15e168 added hgignore |
| 75 () draft | 74 () draft |
| 151 +foo | 150 +foo |
| 152 record change 3/3 to 'c'? [Ynesfdaq?] y | 151 record change 3/3 to 'c'? [Ynesfdaq?] y |
| 153 | 152 |
| 154 created new head | 153 created new head |
| 155 continue splitting? [Ycdq?] c | 154 continue splitting? [Ycdq?] c |
| 156 1 new orphan changesets | |
| 157 | 155 |
| 158 $ hg glog | 156 $ hg glog |
| 159 @ 9:c0fbf8aaf6c4 added a b c | 157 @ 9:c0fbf8aaf6c4 added a b c |
| 160 | () draft | 158 | () draft |
| 161 o 8:f2632392aefe added a b c | 159 o 8:f2632392aefe added a b c |
| 162 | () draft | 160 | () draft |
| 163 | * 7:d48a30875f01 added d | 161 | o 7:d48a30875f01 added d |
| 164 | | () draft | 162 | | () draft |
| 165 | x 6:f89e4764f2ed added a b c | 163 | x 6:f89e4764f2ed added a b c |
| 166 |/ () draft | 164 |/ () draft |
| 167 o 0:8fa14d15e168 added hgignore | 165 o 0:8fa14d15e168 added hgignore |
| 168 () draft | 166 () draft |
| 172 $ hg glog | 170 $ hg glog |
| 173 @ 10:7f87764e5b64 added a b c | 171 @ 10:7f87764e5b64 added a b c |
| 174 | () draft | 172 | () draft |
| 175 | o 8:f2632392aefe added a b c | 173 | o 8:f2632392aefe added a b c |
| 176 |/ () draft | 174 |/ () draft |
| 177 | * 7:d48a30875f01 added d | 175 | o 7:d48a30875f01 added d |
| 178 | | () draft | 176 | | () draft |
| 179 | x 6:f89e4764f2ed added a b c | 177 | x 6:f89e4764f2ed added a b c |
| 180 |/ () draft | 178 |/ () draft |
| 181 o 0:8fa14d15e168 added hgignore | 179 o 0:8fa14d15e168 added hgignore |
| 182 () draft | 180 () draft |