Mercurial > evolve
comparison tests/test-unstability-resolution-result.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 | 7a5c6109ee84 |
| children | 79bc0f1a832e |
comparison
equal
deleted
inserted
replaced
| 4514:ef1c322c389d | 4516:f54bb6eaf5e6 |
|---|---|
| 34 $ hg up 1 | 34 $ hg up 1 |
| 35 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 35 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 36 (leaving bookmark changea) | 36 (leaving bookmark changea) |
| 37 $ echo a >> a | 37 $ echo a >> a |
| 38 $ hg amend -m changea | 38 $ hg amend -m changea |
| 39 1 new orphan changesets | |
| 40 $ hg evolve -v --confirm | 39 $ hg evolve -v --confirm |
| 41 move:[2] changea | 40 move:[2] changea |
| 42 atop:[3] changea | 41 atop:[3] changea |
| 43 perform evolve? [Ny] n | 42 perform evolve? [Ny] n |
| 44 abort: evolve aborted by user | 43 abort: evolve aborted by user |
| 82 gdown have been deprecated in favor of previous | 81 gdown have been deprecated in favor of previous |
| 83 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 82 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 84 [3] changea | 83 [3] changea |
| 85 $ echo 'a' > a | 84 $ echo 'a' > a |
| 86 $ hg amend | 85 $ hg amend |
| 87 1 new orphan changesets | |
| 88 $ hg evolve | 86 $ hg evolve |
| 89 move:[4] newer a | 87 move:[4] newer a |
| 90 atop:[5] changea | 88 atop:[5] changea |
| 91 merging a | 89 merging a |
| 92 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 90 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
| 146 $ hg amend | 144 $ hg amend |
| 147 | 145 |
| 148 Make precursors public | 146 Make precursors public |
| 149 | 147 |
| 150 $ hg phase --hidden --public 1cf0aacfd363 | 148 $ hg phase --hidden --public 1cf0aacfd363 |
| 151 1 new phase-divergent changesets | |
| 152 $ glog | 149 $ glog |
| 153 @ 9:99c21c89bcef@default(draft) bk:[] newer a | 150 @ 9:99c21c89bcef@default(draft) bk:[] newer a |
| 154 | | 151 | |
| 155 o 7:7bc2f5967f5e@default(draft) bk:[] add c | 152 o 7:7bc2f5967f5e@default(draft) bk:[] add c |
| 156 | | 153 | |