equal
deleted
inserted
replaced
209 4 feature-B: another feature - test |
209 4 feature-B: another feature - test |
210 1 : a nifty feature - test |
210 1 : a nifty feature - test |
211 0 : base - test |
211 0 : base - test |
212 $ hg up -q 1 |
212 $ hg up -q 1 |
213 Working directory parent is obsolete |
213 Working directory parent is obsolete |
214 $ hg stabilize -n |
|
215 nothing to stabilize here |
|
216 (1 unstable changesets, do you want --any ?) |
|
217 [2] |
|
218 $ hg stabilize -n --any |
|
219 move:[4] another feature |
|
220 atop:[6] a nifty feature |
|
221 hg rebase -Dr f8111a076f09 -d 23409eba69a0 |
|
222 $ hg up -q 6 |
|
223 $ hg stabilize -n |
|
224 move:[4] another feature |
|
225 atop:[6] a nifty feature |
|
226 hg rebase -Dr f8111a076f09 -d 23409eba69a0 |
|
227 $ hg stabilize |
214 $ hg stabilize |
228 move:[4] another feature |
215 move:[4] another feature |
229 atop:[6] a nifty feature |
216 atop:[6] a nifty feature |
230 merging main-file-1 |
217 merging main-file-1 |
231 $ hg log |
218 $ hg log |