$ cat >> $HGRCPATH <<EOF

  > [extensions]

  > rebase=

  > 

  > [phases]

  > publish=False

  > 

  > [alias]

  > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n"

  > EOF

  $ hg init a

  $ cd a

  $ hg unbundle "$TESTDIR/bundles/rebase.hg"

  adding changesets

  adding manifests

  adding file changes

  added 8 changesets with 7 changes to 7 files (+2 heads)

  new changesets cd010b8cd998:02de42196ebe (8 drafts)

  (run 'hg heads' to see heads, 'hg merge' to merge)

  $ hg up tip

  3 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ echo I > I

  $ hg ci -AmI

  adding I

  $ hg tglog

  @  8: e7ec4e813ba6 'I'

  |

  o  7: 02de42196ebe 'H'

  |

  | o  6: eea13746799a 'G'

  |/|

  o |  5: 24b6387c8c8c 'F'

  | |

  | o  4: 9520eea781bc 'E'

  |/

  | o  3: 32af7686d403 'D'

  | |

  | o  2: 5fddd98957c8 'C'

  | |

  | o  1: 42ccdea3bb16 'B'

  |/

  o  0: cd010b8cd998 'A'

  $ cd ..

Version with only two heads (to allow default destination to work)

  $ hg clone -q -u . a a2heads -r 3 -r 8

These fail:

  $ hg clone -q -u . a a0

  $ cd a0

  $ hg rebase -s 8 -d 7

  nothing to rebase

  [1]

  $ hg rebase --continue --abort

  abort: cannot specify both --abort and --continue

  [255]

  $ hg rebase --continue --collapse

  abort: cannot use collapse with continue or abort

  [255]

  $ hg rebase --continue --dest 4

  abort: cannot specify both --continue and --dest

  [255]

  $ hg rebase --base 5 --source 4

  abort: cannot specify both --source and --base

  [255]

  $ hg rebase --rev 5 --source 4

  abort: cannot specify both --rev and --source

  [255]

  $ hg rebase --base 5 --rev 4

  abort: cannot specify both --rev and --base

  [255]

  $ hg rebase --base 6

  abort: branch 'default' has 3 heads - please rebase to an explicit rev

  (run 'hg heads .' to see heads, specify destination with -d)

  [255]

  $ hg rebase --rev '1 & !1' --dest 8

  empty "rev" revision set - nothing to rebase

  [1]

  $ hg rebase --rev 'wdir()' --dest 6

  abort: cannot rebase the working copy

  [255]

  $ hg rebase --source 'wdir()' --dest 6

  abort: cannot rebase the working copy

  [255]

  $ hg rebase --source '1 & !1' --dest 8

  empty "source" revision set - nothing to rebase

  [1]

  $ hg rebase --base '1 & !1' --dest 8

  empty "base" revision set - can't compute rebase set

  [1]

  $ hg rebase --dest 8

  nothing to rebase - working directory parent is also destination

  [1]

  $ hg rebase -b . --dest 8

  nothing to rebase - e7ec4e813ba6 is both "base" and destination

  [1]

  $ hg up -q 7

  $ hg rebase --dest 8 --traceback

  nothing to rebase - working directory parent is already an ancestor of destination e7ec4e813ba6

  [1]

  $ hg rebase --dest 8 -b.

  nothing to rebase - "base" 02de42196ebe is already an ancestor of destination e7ec4e813ba6

  [1]

  $ hg rebase --dest '1 & !1'

  abort: empty revision set

  [255]

These work:

Rebase with no arguments (from 3 onto 8):

  $ cd ..

  $ hg clone -q -u . a2heads a1

  $ cd a1

  $ hg up -q -C 3

  $ hg rebase

  rebasing 1:42ccdea3bb16 "B"

  rebasing 2:5fddd98957c8 "C"

  rebasing 3:32af7686d403 "D"

  saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg

  $ hg tglog

  @  6: ed65089c18f8 'D'

  |

  o  5: 7621bf1a2f17 'C'

  |

  o  4: 9430a62369c6 'B'

  |

  o  3: e7ec4e813ba6 'I'

  |

  o  2: 02de42196ebe 'H'

  |

  o  1: 24b6387c8c8c 'F'

  |

  o  0: cd010b8cd998 'A'

Try to rollback after a rebase (fail):

  $ hg rollback

  no rollback information available

  [1]

  $ cd ..

Rebase with base == '.' => same as no arguments (from 3 onto 8):

  $ hg clone -q -u 3 a2heads a2

  $ cd a2

  $ hg rebase --base .

  rebasing 1:42ccdea3bb16 "B"

  rebasing 2:5fddd98957c8 "C"

  rebasing 3:32af7686d403 "D"

  saved backup bundle to $TESTTMP/a2/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg

  $ hg tglog

  @  6: ed65089c18f8 'D'

  |

  o  5: 7621bf1a2f17 'C'

  |

  o  4: 9430a62369c6 'B'

  |

  o  3: e7ec4e813ba6 'I'

  |

  o  2: 02de42196ebe 'H'

  |

  o  1: 24b6387c8c8c 'F'

  |

  o  0: cd010b8cd998 'A'

  $ cd ..

Rebase with dest == branch(.) => same as no arguments (from 3 onto 8):

  $ hg clone -q -u 3 a a3

  $ cd a3

  $ hg rebase --dest 'branch(.)'

  rebasing 1:42ccdea3bb16 "B"

  rebasing 2:5fddd98957c8 "C"

  rebasing 3:32af7686d403 "D"

  saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg

  $ hg tglog

  @  8: ed65089c18f8 'D'

  |

  o  7: 7621bf1a2f17 'C'

  |

  o  6: 9430a62369c6 'B'

  |

  o  5: e7ec4e813ba6 'I'

  |

  o  4: 02de42196ebe 'H'

  |

  | o  3: eea13746799a 'G'

  |/|

  o |  2: 24b6387c8c8c 'F'

  | |

  | o  1: 9520eea781bc 'E'

  |/

  o  0: cd010b8cd998 'A'

  $ cd ..

Specify only source (from 2 onto 8):

  $ hg clone -q -u . a2heads a4

  $ cd a4

  $ hg rebase --source 'desc("C")'

  rebasing 2:5fddd98957c8 "C"

  rebasing 3:32af7686d403 "D"

  saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg

  $ hg tglog

  o  6: 7726e9fd58f7 'D'

  |

  o  5: 72c8333623d0 'C'

  |

  @  4: e7ec4e813ba6 'I'

  |

  o  3: 02de42196ebe 'H'

  |

  o  2: 24b6387c8c8c 'F'

  |

  | o  1: 42ccdea3bb16 'B'

  |/

  o  0: cd010b8cd998 'A'

  $ cd ..

Specify only dest (from 3 onto 6):

  $ hg clone -q -u 3 a a5

  $ cd a5

  $ hg rebase --dest 6

  rebasing 1:42ccdea3bb16 "B"

  rebasing 2:5fddd98957c8 "C"

  rebasing 3:32af7686d403 "D"

  saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg

  $ hg tglog

  @  8: 8eeb3c33ad33 'D'

  |

  o  7: 2327fea05063 'C'

  |

  o  6: e4e5be0395b2 'B'

  |

  | o  5: e7ec4e813ba6 'I'

  | |

  | o  4: 02de42196ebe 'H'

  | |

  o |  3: eea13746799a 'G'

  |\|

  | o  2: 24b6387c8c8c 'F'

  | |

  o |  1: 9520eea781bc 'E'

  |/

  o  0: cd010b8cd998 'A'

  $ cd ..

Specify only base (from 1 onto 8):

  $ hg clone -q -u . a2heads a6

  $ cd a6

  $ hg rebase --base 'desc("D")'

  rebasing 1:42ccdea3bb16 "B"

  rebasing 2:5fddd98957c8 "C"

  rebasing 3:32af7686d403 "D"

  saved backup bundle to $TESTTMP/a6/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg

  $ hg tglog

  o  6: ed65089c18f8 'D'

  |

  o  5: 7621bf1a2f17 'C'

  |

  o  4: 9430a62369c6 'B'

  |

  @  3: e7ec4e813ba6 'I'

  |

  o  2: 02de42196ebe 'H'

  |

  o  1: 24b6387c8c8c 'F'

  |

  o  0: cd010b8cd998 'A'

  $ cd ..

Specify source and dest (from 2 onto 7):

  $ hg clone -q -u . a a7

  $ cd a7

  $ hg rebase --source 2 --dest 7

  rebasing 2:5fddd98957c8 "C"

  rebasing 3:32af7686d403 "D"

  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg

  $ hg tglog

  o  8: 668acadedd30 'D'

  |

  o  7: 09eb682ba906 'C'

  |

  | @  6: e7ec4e813ba6 'I'

  |/

  o  5: 02de42196ebe 'H'

  |

  | o  4: eea13746799a 'G'

  |/|

  o |  3: 24b6387c8c8c 'F'

  | |

  | o  2: 9520eea781bc 'E'

  |/

  | o  1: 42ccdea3bb16 'B'

  |/

  o  0: cd010b8cd998 'A'

  $ cd ..

Specify base and dest (from 1 onto 7):

  $ hg clone -q -u . a a8

  $ cd a8

  $ hg rebase --base 3 --dest 7

  rebasing 1:42ccdea3bb16 "B"

  rebasing 2:5fddd98957c8 "C"

  rebasing 3:32af7686d403 "D"

  saved backup bundle to $TESTTMP/a8/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg

  $ hg tglog

  o  8: 287cc92ba5a4 'D'

  |

  o  7: 6824f610a250 'C'

  |

  o  6: 7c6027df6a99 'B'

  |

  | @  5: e7ec4e813ba6 'I'

  |/

  o  4: 02de42196ebe 'H'

  |

  | o  3: eea13746799a 'G'

  |/|

  o |  2: 24b6387c8c8c 'F'

  | |

  | o  1: 9520eea781bc 'E'

  |/

  o  0: cd010b8cd998 'A'

  $ cd ..

Specify only revs (from 2 onto 8)

  $ hg clone -q -u . a2heads a9

  $ cd a9

  $ hg rebase --rev 'desc("C")::'

  rebasing 2:5fddd98957c8 "C"

  rebasing 3:32af7686d403 "D"

  saved backup bundle to $TESTTMP/a9/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg

  $ hg tglog

  o  6: 7726e9fd58f7 'D'

  |

  o  5: 72c8333623d0 'C'

  |

  @  4: e7ec4e813ba6 'I'

  |

  o  3: 02de42196ebe 'H'

  |

  o  2: 24b6387c8c8c 'F'

  |

  | o  1: 42ccdea3bb16 'B'

  |/

  o  0: cd010b8cd998 'A'

  $ cd ..

Rebasing both a single revision and a merge in one command

  $ hg clone -q -u . a aX

  $ cd aX

  $ hg rebase -r 3 -r 6 --dest 8