equal
deleted
inserted
replaced
121 | o 1:draft 'B' |
121 | o 1:draft 'B' |
122 |/ |
122 |/ |
123 o 0:draft 'A' |
123 o 0:draft 'A' |
124 |
124 |
125 $ hg rebase -s 5 -d 4 --keepbranches |
125 $ hg rebase -s 5 -d 4 --keepbranches |
126 rebasing 5:01e6ebbd8272 "F" (tip) |
126 rebasing 5:01e6ebbd8272 tip "F" |
127 merging A |
127 merging A |
128 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
128 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
129 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
129 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
130 [1] |
130 [1] |
131 |
131 |
135 $ rm A.orig |
135 $ rm A.orig |
136 $ hg resolve -m A |
136 $ hg resolve -m A |
137 (no more unresolved files) |
137 (no more unresolved files) |
138 continue: hg rebase --continue |
138 continue: hg rebase --continue |
139 $ hg rebase --continue |
139 $ hg rebase --continue |
140 rebasing 5:01e6ebbd8272 "F" (tip) |
140 rebasing 5:01e6ebbd8272 tip "F" |
141 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/01e6ebbd8272-6fd3a015-rebase.hg |
141 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/01e6ebbd8272-6fd3a015-rebase.hg |
142 |
142 |
143 $ hg tglog |
143 $ hg tglog |
144 @ 5:draft 'F' notdefault |
144 @ 5:draft 'F' notdefault |
145 | |
145 | |