equal
deleted
inserted
replaced
145 |
145 |
146 $ hg rebase -b 'max(branch("dev-two"))' -d dev-one --keepbranches |
146 $ hg rebase -b 'max(branch("dev-two"))' -d dev-one --keepbranches |
147 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
147 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
148 |
148 |
149 $ hg tglog |
149 $ hg tglog |
150 @ 9: 'dev-two named branch' dev-two |
150 o 9: 'dev-two named branch' dev-two |
151 | |
151 | |
152 o 8: 'H' |
152 o 8: 'H' |
153 | |
153 | |
154 | o 7: 'G' |
154 | o 7: 'G' |
155 |/| |
155 |/| |
156 o | 6: 'F' |
156 o | 6: 'F' |
157 | | |
157 | | |
158 o | 5: 'dev-one named branch' dev-one |
158 @ | 5: 'dev-one named branch' dev-one |
159 | | |
159 | | |
160 | o 4: 'E' |
160 | o 4: 'E' |
161 | | |
161 | | |
162 o | 3: 'D' |
162 o | 3: 'D' |
163 | | |
163 | | |
169 |
169 |
170 $ hg rebase -s 'max(branch("dev-one"))' -d 0 --keepbranches |
170 $ hg rebase -s 'max(branch("dev-one"))' -d 0 --keepbranches |
171 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
171 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
172 |
172 |
173 $ hg tglog |
173 $ hg tglog |
174 @ 8: 'dev-two named branch' dev-two |
174 o 8: 'dev-two named branch' dev-two |
175 | |
175 | |
176 o 7: 'H' |
176 o 7: 'H' |
177 | |
177 | |
178 | o 6: 'G' |
178 | o 6: 'G' |
179 |/| |
179 |/| |
185 | | |
185 | | |
186 | o 2: 'C' |
186 | o 2: 'C' |
187 | | |
187 | | |
188 | o 1: 'B' |
188 | o 1: 'B' |
189 |/ |
189 |/ |
190 o 0: 'A' |
190 @ 0: 'A' |
191 |
191 |
192 |
192 |
193 Rebasing descendant onto ancestor across different named branches |
193 Rebasing descendant onto ancestor across different named branches |
194 |
194 |
195 $ hg rebase -s 1 -d 8 --keepbranches |
195 $ hg rebase -s 1 -d 8 --keepbranches |
196 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
196 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
197 |
197 |
198 $ hg tglog |
198 $ hg tglog |
199 @ 8: 'D' |
199 o 8: 'D' |
200 | |
200 | |
201 o 7: 'C' |
201 o 7: 'C' |
202 | |
202 | |
203 o 6: 'B' |
203 o 6: 'B' |
204 | |
204 | |
210 |/| |
210 |/| |
211 o | 2: 'F' |
211 o | 2: 'F' |
212 | | |
212 | | |
213 | o 1: 'E' |
213 | o 1: 'E' |
214 |/ |
214 |/ |
215 o 0: 'A' |
215 @ 0: 'A' |
216 |
216 |
217 $ hg rebase -s 4 -d 5 |
217 $ hg rebase -s 4 -d 5 |
218 abort: source is ancestor of destination |
218 abort: source is ancestor of destination |
219 [255] |
219 [255] |
220 |
220 |
221 $ hg rebase -s 5 -d 4 |
221 $ hg rebase -s 5 -d 4 |
222 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
222 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
223 |
223 |
224 $ hg tglog |
224 $ hg tglog |
225 @ 8: 'D' |
225 o 8: 'D' |
226 | |
226 | |
227 o 7: 'C' |
227 o 7: 'C' |
228 | |
228 | |
229 o 6: 'B' |
229 o 6: 'B' |
230 | |
230 | |
236 |/| |
236 |/| |
237 o | 2: 'F' |
237 o | 2: 'F' |
238 | | |
238 | | |
239 | o 1: 'E' |
239 | o 1: 'E' |
240 |/ |
240 |/ |
241 o 0: 'A' |
241 @ 0: 'A' |
242 |
242 |
243 $ cd .. |
243 $ cd .. |