Mercurial > hg
comparison tests/test-rebase-parameters.t @ 23246:643c58303fb0 stable 3.2.1
rebase: fix rebase with no common ancestors (issue4446)
The new rebase revset didn't check for the case when there are no common
ancestors. Now it does. The new behavior should be the same as the pre-3.2
behavior. Added a test.
author | Durham Goode <durham@fb.com> |
---|---|
date | Mon, 10 Nov 2014 10:44:42 -0800 |
parents | d5b04ee8ecf7 |
children | 328afbad6e57 |
comparison
equal
deleted
inserted
replaced
23245:d33a90cb2a32 | 23246:643c58303fb0 |
---|---|
466 $ hg rebase --interactive | 466 $ hg rebase --interactive |
467 abort: interactive history editing is supported by the 'histedit' extension (see 'hg help histedit') | 467 abort: interactive history editing is supported by the 'histedit' extension (see 'hg help histedit') |
468 [255] | 468 [255] |
469 | 469 |
470 $ cd .. | 470 $ cd .. |
471 | |
472 No common ancestor | |
473 | |
474 $ hg init separaterepo | |
475 $ cd separaterepo | |
476 $ touch a | |
477 $ hg commit -Aqm a | |
478 $ hg up -q null | |
479 $ touch b | |
480 $ hg commit -Aqm b | |
481 $ hg rebase -d 0 | |
482 nothing to rebase from d7486e00c6f1 to 3903775176ed | |
483 [1] | |
484 $ cd .. |