equal
deleted
inserted
replaced
97 $ hg stabilize --continue |
97 $ hg stabilize --continue |
98 grafting revision 5 |
98 grafting revision 5 |
99 |
99 |
100 Stabilize of late comer with different parent |
100 Stabilize of late comer with different parent |
101 ================================================== |
101 ================================================== |
|
102 |
102 (the with same parent is handled in test-evolve.t) |
103 (the with same parent is handled in test-evolve.t) |
103 |
104 |
104 $ glog |
105 $ glog |
105 @ 8:e3183e9c0961@default(draft) bk:[] newer a |
106 @ 8:e3183e9c0961@default(draft) bk:[] newer a |
106 | |
107 | |
168 |/ |
169 |/ |
169 o 7:e8cc1b534401@default(public) bk:[changea] changea |
170 o 7:e8cc1b534401@default(public) bk:[changea] changea |
170 | |
171 | |
171 o 0:07f494440405@default(public) bk:[] adda |
172 o 0:07f494440405@default(public) bk:[] adda |
172 |
173 |
|
174 |
|
175 Stabilize of conflicting changeset with same parent |
|
176 ==================================================== |
|
177 |
|
178 |
|
179 $ hg up 9 |
|
180 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
181 $ glog |
|
182 o 14:1d94fef80e85@default(draft) bk:[] latecomer update to e3183e9c0961: |
|
183 | |
|
184 | @ 9:355c5cda4de1@default(draft) bk:[] add c |
|
185 | | |
|
186 o | 8:e3183e9c0961@default(public) bk:[] newer a |
|
187 |/ |
|
188 o 7:e8cc1b534401@default(public) bk:[changea] changea |
|
189 | |
|
190 o 0:07f494440405@default(public) bk:[] adda |
|
191 |
|
192 $ echo 'babar' >> a |
|
193 $ hg amend |
|
194 $ hg up 9 |
|
195 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
196 Working directory parent is obsolete |
|
197 $ mv a a.old |
|
198 $ echo 'jungle' > a |
|
199 $ cat a.old >> a |
|
200 $ rm a.old |
|
201 $ hg amend |
|
202 2 new conflictings changesets |
|
203 $ glog |
|
204 @ 18:5d568f72d576@default(draft) bk:[] add c |
|
205 | |
|
206 | o 16:a311193de6c8@default(draft) bk:[] add c |
|
207 |/ |
|
208 | o 14:1d94fef80e85@default(draft) bk:[] latecomer update to e3183e9c0961: |
|
209 | | |
|
210 | o 8:e3183e9c0961@default(public) bk:[] newer a |
|
211 |/ |
|
212 o 7:e8cc1b534401@default(public) bk:[changea] changea |
|
213 | |
|
214 o 0:07f494440405@default(public) bk:[] adda |
|
215 |
|
216 |
|
217 Stabilize It |
|
218 |
|
219 $ hg stabilize |
|
220 conflicting not handled yet |
|
221 [4] |