equal
deleted
inserted
replaced
213 $ hg bookmark |
213 $ hg bookmark |
214 feature-A 6:23409eba69a0 |
214 feature-A 6:23409eba69a0 |
215 feature-B 4:f8111a076f09 |
215 feature-B 4:f8111a076f09 |
216 $ hg up 6 |
216 $ hg up 6 |
217 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
217 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
218 $ hg bookmark -if feature-A |
218 $ hg bookmark |
219 $ hg bookmark |
219 feature-A 6:23409eba69a0 |
220 feature-A 6:23409eba69a0 |
220 feature-B 4:f8111a076f09 |
221 feature-B 4:f8111a076f09 |
221 $ hg bookmark -if feature-A |
|
222 $ hg graft -O 4 |
222 $ hg graft -O 4 |
223 grafting revision 4 |
223 grafting revision 4 |
224 merging main-file-1 |
224 merging main-file-1 |
225 $ hg bookmark -ifr 7 feature-B # XXX not bookmark support in rebase --keep :-/ |
225 $ hg bookmark -ifr 7 feature-B # XXX not bookmark support in rebase --keep :-/ |
226 $ hg log |
226 $ hg log |