94 abort: unresolved merge conflicts (see hg help resolve) |
94 abort: unresolved merge conflicts (see hg help resolve) |
95 [255] |
95 [255] |
96 $ hg resolve -m a |
96 $ hg resolve -m a |
97 $ hg stabilize --continue |
97 $ hg stabilize --continue |
98 grafting revision 5 |
98 grafting revision 5 |
|
99 |
|
100 Stabilize of late comer with different parent |
|
101 ================================================== |
|
102 (the with same parent is handled in test-evolve.t) |
|
103 |
|
104 $ glog |
|
105 @ 8:e3183e9c0961@default(draft) bk:[] newer a |
|
106 | |
|
107 o 7:e8cc1b534401@default(draft) bk:[changea] changea |
|
108 | |
|
109 o 0:07f494440405@default(draft) bk:[] adda |
|
110 |
|
111 Add another commit |
|
112 |
|
113 $ hg gdown |
|
114 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
115 [7] changea |
|
116 $ echo 'c' > c |
|
117 $ hg add c |
|
118 $ hg commit -m 'add c' |
|
119 created new head |
|
120 |
|
121 Get a successors of 8 on it |
|
122 |
|
123 $ hg graft -O 8 |
|
124 grafting revision 8 |
|
125 |
|
126 Add real change to the successors |
|
127 |
|
128 $ echo 'babar' >> a |
|
129 $ hg amend |
|
130 |
|
131 Make precursors public |
|
132 |
|
133 $ hg phase --public 8 |
|
134 1 new latecomers changesets |
|
135 $ glog |
|
136 @ 12:15c83af6f3a3@default(draft) bk:[] newer a |
|
137 | |
|
138 o 9:355c5cda4de1@default(draft) bk:[] add c |
|
139 | |
|
140 | o 8:e3183e9c0961@default(public) bk:[] newer a |
|
141 |/ |
|
142 o 7:e8cc1b534401@default(public) bk:[changea] changea |
|
143 | |
|
144 o 0:07f494440405@default(public) bk:[] adda |
|
145 |
|
146 |
|
147 Stabilize ! |
|
148 |
|
149 $ hg stabilize --any --dry-run |
|
150 recreate:[12] newer a |
|
151 atop:[8] newer a |
|
152 hg rebase --rev 15c83af6f3a3 --detach e8cc1b534401; |
|
153 hg update e3183e9c0961; |
|
154 hg revert --all --rev 15c83af6f3a3; |
|
155 hg commit --msg "latecomer update to %s" (no-eol) |
|
156 $ hg stabilize --any |
|
157 recreate:[12] newer a |
|
158 atop:[8] newer a |
|
159 rebasing to destination parent: e8cc1b534401 |
|
160 computing new diff |
|
161 commited as 1d94fef80e85 |
|
162 $ glog |
|
163 @ 14:1d94fef80e85@default(draft) bk:[] latecomer update to e3183e9c0961: |
|
164 | |
|
165 | o 9:355c5cda4de1@default(draft) bk:[] add c |
|
166 | | |
|
167 o | 8:e3183e9c0961@default(public) bk:[] newer a |
|
168 |/ |
|
169 o 7:e8cc1b534401@default(public) bk:[changea] changea |
|
170 | |
|
171 o 0:07f494440405@default(public) bk:[] adda |
|
172 |