Mercurial > evolve
comparison tests/test-evolve-abort-phasediv.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 | f9a850018daa |
| children | f54bb6eaf5e6 |
comparison
equal
deleted
inserted
replaced
| 4362:8bd60e09dfb4 | 4363:a2fdbece7ce1 |
|---|---|
| 64 | () draft | 64 | () draft |
| 65 o 0:8fa14d15e168 added hgignore | 65 o 0:8fa14d15e168 added hgignore |
| 66 () draft | 66 () draft |
| 67 | 67 |
| 68 $ hg phase -r c41c793e0ef1 --public --hidden | 68 $ hg phase -r c41c793e0ef1 --public --hidden |
| 69 1 new phase-divergent changesets | |
| 70 | 69 |
| 71 $ hg glog | 70 $ hg glog |
| 72 @ 6:ddba58020bc0 added d | 71 @ 6:ddba58020bc0 added d |
| 73 | () draft | 72 | () draft |
| 74 | o 4:c41c793e0ef1 added d | 73 | o 4:c41c793e0ef1 added d |
| 155 picking 3:ca1b80f7960a "added c" | 154 picking 3:ca1b80f7960a "added c" |
| 156 $ echo foobar > b | 155 $ echo foobar > b |
| 157 $ hg add b | 156 $ hg add b |
| 158 $ hg amend | 157 $ hg amend |
| 159 $ hg phase -r c41c793e0ef1 --public --hidden | 158 $ hg phase -r c41c793e0ef1 --public --hidden |
| 160 2 new phase-divergent changesets | |
| 161 | 159 |
| 162 $ hg evolve --list | 160 $ hg evolve --list |
| 163 e44ebefe4f54: added d | 161 e44ebefe4f54: added d |
| 164 phase-divergent: c41c793e0ef1 (immutable precursor) | 162 phase-divergent: c41c793e0ef1 (immutable precursor) |
| 165 | 163 |
| 184 $ hg glog --hidden | 182 $ hg glog --hidden |
| 185 @ 9:28cd06b3f801 added c | 183 @ 9:28cd06b3f801 added c |
| 186 | () draft | 184 | () draft |
| 187 | x 8:9ff8adbe8a24 added c | 185 | x 8:9ff8adbe8a24 added c |
| 188 |/ () draft | 186 |/ () draft |
| 189 | * 7:e44ebefe4f54 added d | 187 | o 7:e44ebefe4f54 added d |
| 190 |/ () draft | 188 |/ () draft |
| 191 | x 6:ddba58020bc0 added d | 189 | x 6:ddba58020bc0 added d |
| 192 |/ () draft | 190 |/ () draft |
| 193 | x 5:cfe30edc6125 added d | 191 | x 5:cfe30edc6125 added d |
| 194 |/ () draft | 192 |/ () draft |
| 216 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') | 214 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
| 217 fix conflicts and see `hg help evolve.interrupted` | 215 fix conflicts and see `hg help evolve.interrupted` |
| 218 [1] | 216 [1] |
| 219 | 217 |
| 220 $ hg evolve --abort | 218 $ hg evolve --abort |
| 221 1 new phase-divergent changesets | |
| 222 evolve aborted | 219 evolve aborted |
| 223 working directory is now at 28cd06b3f801 | 220 working directory is now at 28cd06b3f801 |
| 224 | 221 |
| 225 $ hg glog --hidden | 222 $ hg glog --hidden |
| 226 @ 9:28cd06b3f801 added c | 223 @ 9:28cd06b3f801 added c |
| 227 | () draft | 224 | () draft |
| 228 | x 8:9ff8adbe8a24 added c | 225 | x 8:9ff8adbe8a24 added c |
| 229 |/ () draft | 226 |/ () draft |
| 230 | * 7:e44ebefe4f54 added d | 227 | o 7:e44ebefe4f54 added d |
| 231 |/ () draft | 228 |/ () draft |
| 232 | x 6:ddba58020bc0 added d | 229 | x 6:ddba58020bc0 added d |
| 233 |/ () draft | 230 |/ () draft |
| 234 | x 5:cfe30edc6125 added d | 231 | x 5:cfe30edc6125 added d |
| 235 |/ () draft | 232 |/ () draft |
| 254 $ hg amend | 251 $ hg amend |
| 255 | 252 |
| 256 $ hg glog --hidden | 253 $ hg glog --hidden |
| 257 @ 10:ef9b72b9b42c added d | 254 @ 10:ef9b72b9b42c added d |
| 258 | () draft | 255 | () draft |
| 259 | * 9:28cd06b3f801 added c | 256 | o 9:28cd06b3f801 added c |
| 260 |/ () draft | 257 |/ () draft |
| 261 | x 8:9ff8adbe8a24 added c | 258 | x 8:9ff8adbe8a24 added c |
| 262 |/ () draft | 259 |/ () draft |
| 263 | x 7:e44ebefe4f54 added d | 260 | x 7:e44ebefe4f54 added d |
| 264 |/ () draft | 261 |/ () draft |
| 301 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 298 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 302 fix conflicts and see `hg help evolve.interrupted` | 299 fix conflicts and see `hg help evolve.interrupted` |
| 303 [1] | 300 [1] |
| 304 | 301 |
| 305 $ hg evolve --abort | 302 $ hg evolve --abort |
| 306 1 new phase-divergent changesets | |
| 307 evolve aborted | 303 evolve aborted |
| 308 working directory is now at ef9b72b9b42c | 304 working directory is now at ef9b72b9b42c |
| 309 | 305 |
| 310 $ hg glog --hidden | 306 $ hg glog --hidden |
| 311 @ 10:ef9b72b9b42c added d | 307 @ 10:ef9b72b9b42c added d |
| 312 | () draft | 308 | () draft |
| 313 | * 9:28cd06b3f801 added c | 309 | o 9:28cd06b3f801 added c |
| 314 |/ () draft | 310 |/ () draft |
| 315 | x 8:9ff8adbe8a24 added c | 311 | x 8:9ff8adbe8a24 added c |
| 316 |/ () draft | 312 |/ () draft |
| 317 | x 7:e44ebefe4f54 added d | 313 | x 7:e44ebefe4f54 added d |
| 318 |/ () draft | 314 |/ () draft |