equal
deleted
inserted
replaced
80 Fix the 2nd conflict: |
80 Fix the 2nd conflict: |
81 |
81 |
82 $ echo mq1r1mq2 > f |
82 $ echo mq1r1mq2 > f |
83 $ hg resolve -m f |
83 $ hg resolve -m f |
84 $ hg rebase -c |
84 $ hg rebase -c |
85 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob) |
85 saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob) |
86 |
86 |
87 $ hg tglog |
87 $ hg tglog |
88 @ 3: 'P1' tags: f2.patch qtip tip |
88 @ 3: 'P1' tags: f2.patch qtip tip |
89 | |
89 | |
90 o 2: 'P0' tags: f.patch qbase |
90 o 2: 'P0' tags: f.patch qbase |
189 |
189 |
190 |
190 |
191 Rebase the applied mq patches: |
191 Rebase the applied mq patches: |
192 |
192 |
193 $ hg rebase -s 2 -d 1 |
193 $ hg rebase -s 2 -d 1 |
194 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob) |
194 saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob) |
195 |
195 |
196 $ hg qci -m 'save patch state' |
196 $ hg qci -m 'save patch state' |
197 |
197 |
198 $ hg qseries -s |
198 $ hg qseries -s |
199 f_git.patch: P0 (git) |
199 f_git.patch: P0 (git) |