comparison tests/test-rebase-detach.t @ 15132:81f76098211e

rebase: allow rebase to ancestor (issue3010) We only deny rebasing onto direct parent. Thanks to the ancestor argument of merge. the "implementation" of this feature only consist in loosing the check and imply detach when rebasing on ancestor.
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Mon, 19 Sep 2011 16:57:13 +0200
parents 012c719103ab
children 9910f60a37ee 3411a83e232a
comparison
equal deleted inserted replaced
15131:7c26ce9edbd2 15132:81f76098211e
279 | | 279 | |
280 | o 1: 'E' 280 | o 1: 'E'
281 |/ 281 |/
282 o 0: 'A' 282 o 0: 'A'
283 283
284
285 $ hg rebase -d 5 -s 7
286 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-backup.hg
287 $ hg tglog
288 @ 8: 'D'
289 |
290 o 7: 'C'
291 |
292 | o 6: 'B'
293 |/
294 o 5: 'extra branch'
295
296 o 4: 'H'
297 |
298 | o 3: 'G'
299 |/|
300 o | 2: 'F'
301 | |
302 | o 1: 'E'
303 |/
304 o 0: 'A'
305