Mercurial > evolve
comparison tests/test-unstability-resolution-result.t @ 6001:806bdef19f1c mercurial-5.2
test-compat: merge mercurial-5.3 into mercurial-5.2
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 12 Aug 2021 22:01:00 +0200 |
| parents | 43c4db536990 |
| children | c0921b5277a0 |
comparison
equal
deleted
inserted
replaced
| 5943:bc445a876757 | 6001:806bdef19f1c |
|---|---|
| 166 recreate:[9] newer a | 166 recreate:[9] newer a |
| 167 atop:[6] newer a | 167 atop:[6] newer a |
| 168 hg rebase --rev 99c21c89bcef --dest 66719795a494; | 168 hg rebase --rev 99c21c89bcef --dest 66719795a494; |
| 169 hg update 1cf0aacfd363; | 169 hg update 1cf0aacfd363; |
| 170 hg revert --all --rev 99c21c89bcef; | 170 hg revert --all --rev 99c21c89bcef; |
| 171 hg commit --msg "phase-divergent update to 99c21c89bcef" | 171 hg commit --message "phase-divergent update to 99c21c89bcef" |
| 172 $ hg evolve --any --confirm --phase-divergent | 172 $ hg evolve --any --confirm --phase-divergent |
| 173 recreate:[9] newer a | 173 recreate:[9] newer a |
| 174 atop:[6] newer a | 174 atop:[6] newer a |
| 175 perform evolve? [Ny] n | 175 perform evolve? [Ny] n |
| 176 abort: evolve aborted by user | 176 abort: evolve aborted by user |