equal
deleted
inserted
replaced
94 @@ -1,1 +1,3 @@ |
94 @@ -1,1 +1,3 @@ |
95 a |
95 a |
96 +a |
96 +a |
97 +newer a |
97 +newer a |
98 $ hg evolve --continue |
98 $ hg evolve --continue |
99 grafting 5:3655f0f50885 "newer a" |
99 evolving 5:3655f0f50885 "newer a" |
100 abort: unresolved merge conflicts (see 'hg help resolve') |
100 abort: unresolved merge conflicts (see 'hg help resolve') |
101 [255] |
101 [255] |
102 $ hg resolve -m a |
102 $ hg resolve -m a |
103 (no more unresolved files) |
103 (no more unresolved files) |
104 $ hg evolve --continue |
104 $ hg evolve --continue |
105 grafting 5:3655f0f50885 "newer a" |
105 evolving 5:3655f0f50885 "newer a" |
106 |
106 |
107 Stabilize latecomer with different parent |
107 Stabilize latecomer with different parent |
108 ========================================= |
108 ========================================= |
109 |
109 |
110 (the same-parent case is handled in test-evolve.t) |
110 (the same-parent case is handled in test-evolve.t) |
160 recreate:[12] newer a |
160 recreate:[12] newer a |
161 atop:[8] newer a |
161 atop:[8] newer a |
162 hg rebase --rev (73b15c7566e9|d5c7ef82d003) --dest 66719795a494; (re) |
162 hg rebase --rev (73b15c7566e9|d5c7ef82d003) --dest 66719795a494; (re) |
163 hg update 1cf0aacfd363; |
163 hg update 1cf0aacfd363; |
164 hg revert --all --rev (73b15c7566e9|d5c7ef82d003); (re) |
164 hg revert --all --rev (73b15c7566e9|d5c7ef82d003); (re) |
165 hg commit --msg "bumped update to %s" (no-eol) |
165 hg commit --msg "bumped update to d5c7ef82d003" |
166 $ hg evolve --any --confirm --phase-divergent |
166 $ hg evolve --any --confirm --phase-divergent |
167 recreate:[12] newer a |
167 recreate:[12] newer a |
168 atop:[8] newer a |
168 atop:[8] newer a |
169 perform evolve? [Ny] n |
169 perform evolve? [Ny] n |
170 abort: evolve aborted by user |
170 abort: evolve aborted by user |