Mercurial > evolve
comparison tests/test-evolve-abort-phasediv.t @ 3930:d00f0c369bc7 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 02 Aug 2018 02:47:44 +0200 |
| parents | 629558d09898 |
| children | 537fd9a86c06 684cc3418ecd |
comparison
equal
deleted
inserted
replaced
| 3929:e709e3817d7e | 3930:d00f0c369bc7 |
|---|---|
| 169 $ hg glog --hidden | 169 $ hg glog --hidden |
| 170 @ 9:28cd06b3f801 added c | 170 @ 9:28cd06b3f801 added c |
| 171 | () draft | 171 | () draft |
| 172 | x 8:9ff8adbe8a24 added c | 172 | x 8:9ff8adbe8a24 added c |
| 173 |/ () draft | 173 |/ () draft |
| 174 | * 7:e44ebefe4f54 added d | 174 | o 7:e44ebefe4f54 added d |
| 175 |/ () draft | 175 |/ () draft |
| 176 | x 6:ddba58020bc0 added d | 176 | x 6:ddba58020bc0 added d |
| 177 |/ () draft | 177 |/ () draft |
| 178 | x 5:cfe30edc6125 added d | 178 | x 5:cfe30edc6125 added d |
| 179 |/ () draft | 179 |/ () draft |
| 201 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') | 201 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
| 202 fix conflicts and see `hg help evolve.interrupted` | 202 fix conflicts and see `hg help evolve.interrupted` |
| 203 [1] | 203 [1] |
| 204 | 204 |
| 205 $ hg evolve --abort | 205 $ hg evolve --abort |
| 206 1 new phase-divergent changesets | |
| 207 evolve aborted | 206 evolve aborted |
| 208 working directory is now at 28cd06b3f801 | 207 working directory is now at 28cd06b3f801 |
| 209 | 208 |
| 210 $ hg glog --hidden | 209 $ hg glog --hidden |
| 211 @ 9:28cd06b3f801 added c | 210 @ 9:28cd06b3f801 added c |
| 212 | () draft | 211 | () draft |
| 213 | x 8:9ff8adbe8a24 added c | 212 | x 8:9ff8adbe8a24 added c |
| 214 |/ () draft | 213 |/ () draft |
| 215 | * 7:e44ebefe4f54 added d | 214 | o 7:e44ebefe4f54 added d |
| 216 |/ () draft | 215 |/ () draft |
| 217 | x 6:ddba58020bc0 added d | 216 | x 6:ddba58020bc0 added d |
| 218 |/ () draft | 217 |/ () draft |
| 219 | x 5:cfe30edc6125 added d | 218 | x 5:cfe30edc6125 added d |
| 220 |/ () draft | 219 |/ () draft |
| 239 $ hg amend | 238 $ hg amend |
| 240 | 239 |
| 241 $ hg glog --hidden | 240 $ hg glog --hidden |
| 242 @ 10:ef9b72b9b42c added d | 241 @ 10:ef9b72b9b42c added d |
| 243 | () draft | 242 | () draft |
| 244 | * 9:28cd06b3f801 added c | 243 | o 9:28cd06b3f801 added c |
| 245 |/ () draft | 244 |/ () draft |
| 246 | x 8:9ff8adbe8a24 added c | 245 | x 8:9ff8adbe8a24 added c |
| 247 |/ () draft | 246 |/ () draft |
| 248 | x 7:e44ebefe4f54 added d | 247 | x 7:e44ebefe4f54 added d |
| 249 |/ () draft | 248 |/ () draft |
| 286 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 285 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 287 fix conflicts and see `hg help evolve.interrupted` | 286 fix conflicts and see `hg help evolve.interrupted` |
| 288 [1] | 287 [1] |
| 289 | 288 |
| 290 $ hg evolve --abort | 289 $ hg evolve --abort |
| 291 1 new phase-divergent changesets | |
| 292 evolve aborted | 290 evolve aborted |
| 293 working directory is now at ef9b72b9b42c | 291 working directory is now at ef9b72b9b42c |
| 294 | 292 |
| 295 $ hg glog --hidden | 293 $ hg glog --hidden |
| 296 @ 10:ef9b72b9b42c added d | 294 @ 10:ef9b72b9b42c added d |
| 297 | () draft | 295 | () draft |
| 298 | * 9:28cd06b3f801 added c | 296 | o 9:28cd06b3f801 added c |
| 299 |/ () draft | 297 |/ () draft |
| 300 | x 8:9ff8adbe8a24 added c | 298 | x 8:9ff8adbe8a24 added c |
| 301 |/ () draft | 299 |/ () draft |
| 302 | x 7:e44ebefe4f54 added d | 300 | x 7:e44ebefe4f54 added d |
| 303 |/ () draft | 301 |/ () draft |