equal
deleted
inserted
replaced
86 (no more unresolved files) |
86 (no more unresolved files) |
87 continue: hg rebase --continue |
87 continue: hg rebase --continue |
88 $ hg rebase -c |
88 $ hg rebase -c |
89 already rebased 2:3504f44bffc0 "P0" (f.patch qbase) as ebe9914c0d1c |
89 already rebased 2:3504f44bffc0 "P0" (f.patch qbase) as ebe9914c0d1c |
90 rebasing 3:929394423cd3 "P1" (f2.patch qtip) |
90 rebasing 3:929394423cd3 "P1" (f2.patch qtip) |
91 saved backup bundle to $TESTTMP/a/.hg/strip-backup/3504f44bffc0-30595b40-backup.hg (glob) |
91 saved backup bundle to $TESTTMP/a/.hg/strip-backup/3504f44bffc0-30595b40-rebase.hg (glob) |
92 |
92 |
93 $ hg tglog |
93 $ hg tglog |
94 @ 3: 'P1' tags: f2.patch qtip tip |
94 @ 3: 'P1' tags: f2.patch qtip tip |
95 | |
95 | |
96 o 2: 'P0' tags: f.patch qbase |
96 o 2: 'P0' tags: f.patch qbase |
203 Rebase the applied mq patches: |
203 Rebase the applied mq patches: |
204 |
204 |
205 $ hg rebase -s 2 -d 1 |
205 $ hg rebase -s 2 -d 1 |
206 rebasing 2:0c587ffcb480 "P0 (git)" (f_git.patch qbase) |
206 rebasing 2:0c587ffcb480 "P0 (git)" (f_git.patch qbase) |
207 rebasing 3:c7f18665e4bc "P1" (f.patch qtip tip) |
207 rebasing 3:c7f18665e4bc "P1" (f.patch qtip tip) |
208 saved backup bundle to $TESTTMP/a/.hg/strip-backup/0c587ffcb480-0ea5695f-backup.hg (glob) |
208 saved backup bundle to $TESTTMP/a/.hg/strip-backup/0c587ffcb480-0ea5695f-rebase.hg (glob) |
209 |
209 |
210 $ hg qci -m 'save patch state' |
210 $ hg qci -m 'save patch state' |
211 |
211 |
212 $ hg qseries -s |
212 $ hg qseries -s |
213 f_git.patch: P0 (git) |
213 f_git.patch: P0 (git) |