$ cat >> $HGRCPATH <<EOF

  > [extensions]

  > rebase=

  > 

  > [phases]

  > publish=False

  > 

  > [alias]

  > tglog = log -G --template "{rev}: '{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)

  (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

  $ cd ..

  $ hg clone -q -u . a a1

  $ cd a1

  $ hg update 3

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

  $ hg branch dev-one

  marked working directory as branch dev-one

  (branches are permanent and global, did you want a bookmark?)

  $ hg ci -m 'dev-one named branch'

  $ hg update 7

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

  $ hg branch dev-two

  marked working directory as branch dev-two

  (branches are permanent and global, did you want a bookmark?)

  $ echo x > x

  $ hg add x

  $ hg ci -m 'dev-two named branch'

  $ hg tglog

  @  9: 'dev-two named branch' dev-two

  |

  | o  8: 'dev-one named branch' dev-one

  | |

  o |  7: 'H'

  | |

  +---o  6: 'G'

  | | |

  o | |  5: 'F'

  | | |

  +---o  4: 'E'

  | |

  | o  3: 'D'

  | |

  | o  2: 'C'

  | |

  | o  1: 'B'

  |/

  o  0: 'A'

Branch name containing a dash (issue3181)

  $ hg rebase -b dev-two -d dev-one --keepbranches

  $ hg tglog

  @  9: 'dev-two named branch' dev-two

  |

  o  8: 'H'

  |

  | o  7: 'G'

  |/|

  o |  6: 'F'

  | |

  o |  5: 'dev-one named branch' dev-one

  | |

  | o  4: 'E'

  | |

  o |  3: 'D'

  | |

  o |  2: 'C'

  | |

  o |  1: 'B'

  |/

  o  0: 'A'

  $ hg rebase -s dev-one -d 0 --keepbranches

  $ hg tglog

  @  8: 'dev-two named branch' dev-two

  |

  o  7: 'H'

  |

  | o  6: 'G'

  |/|

  o |  5: 'F'

  | |

  | o  4: 'E'

  |/

  | o  3: 'D'

  | |

  | o  2: 'C'

  | |

  | o  1: 'B'

  |/

  o  0: 'A'

  $ hg update 3

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

  $ hg branch dev-one

  marked working directory as branch dev-one

  (branches are permanent and global, did you want a bookmark?)

  $ hg ci -m 'dev-one named branch'

  $ hg tglog

  @  9: 'dev-one named branch' dev-one

  |

  | o  8: 'dev-two named branch' dev-two

  | |

  | o  7: 'H'

  | |

  | | o  6: 'G'

  | |/|

  | o |  5: 'F'

  | | |

  | | o  4: 'E'

  | |/

  o |  3: 'D'

  | |

  o |  2: 'C'

  | |

  o |  1: 'B'

  |/

  o  0: 'A'

  $ hg rebase -b 'max(branch("dev-two"))' -d dev-one --keepbranches

  $ hg tglog

  o  9: 'dev-two named branch' dev-two

  |

  o  8: 'H'

  |

  | o  7: 'G'

  |/|

  o |  6: 'F'

  | |

  @ |  5: 'dev-one named branch' dev-one

  | |

  | o  4: 'E'

  | |

  o |  3: 'D'

  | |

  o |  2: 'C'

  | |

  o |  1: 'B'

  |/

  o  0: 'A'

  $ hg rebase -s 'max(branch("dev-one"))' -d 0 --keepbranches

  $ hg tglog

  o  8: 'dev-two named branch' dev-two

  |

  o  7: 'H'

  |

  | o  6: 'G'

  |/|

  o |  5: 'F'

  | |

  | o  4: 'E'

  |/

  | o  3: 'D'

  | |

  | o  2: 'C'

  | |

  | o  1: 'B'

  |/

  @  0: 'A'

Rebasing descendant onto ancestor across different named branches

  $ hg rebase -s 1 -d 8 --keepbranches

  $ hg tglog

  o  8: 'D'

  |

  o  7: 'C'

  |

  o  6: 'B'

  |

  o  5: 'dev-two named branch' dev-two

  |

  o  4: 'H'

  |

  | o  3: 'G'

  |/|

  o |  2: 'F'

  | |

  | o  1: 'E'

  |/

  @  0: 'A'

  $ hg rebase -s 4 -d 5

  abort: source is ancestor of destination

  [255]

  $ hg rebase -s 5 -d 4

  $ hg tglog

  o  8: 'D'

  |

  o  7: 'C'

  |

  o  6: 'B'

  |

  o  5: 'dev-two named branch'

  |

  o  4: 'H'

  |

  | o  3: 'G'

  |/|

  o |  2: 'F'

  | |

  | o  1: 'E'

  |/

  @  0: 'A'

Reopen branch by rebase

  $ hg up -qr3

  $ hg branch -q b

  $ hg ci -m 'create b'

  $ hg ci -m 'close b' --close

  $ hg rebase -b 8 -d b

  reopening closed branch head ea9de14a36c6

  $ cd ..

Rebase to other head on branch

Set up a case:

  $ hg init case1

  $ cd case1

  $ touch f

  $ hg ci -qAm0

  $ hg branch -q b

  $ echo >> f

  $ hg ci -qAm 'b1'

  $ hg up -qr -2

  $ hg branch -qf b

  $ hg ci -qm 'b2'

  $ hg up -qr -3

  $ hg branch -q c

  $ hg ci -m 'c1'

  $ hg tglog

  @  3: 'c1' c

  |

  | o  2: 'b2' b

  |/

  | o  1: 'b1' b

  |/

  o  0: '0'

  $ hg clone -q . ../case2

rebase 'b2' to another lower branch head

  $ hg up -qr 2

  $ hg rebase

  nothing to rebase - working directory parent is also destination

  [1]

  $ hg tglog

  o  3: 'c1' c

  |

  | @  2: 'b2' b

  |/

  | o  1: 'b1' b

  |/

  o  0: '0'

rebase 'b1' on top of the tip of the branch ('b2') - ignoring the tip branch ('c1')

  $ cd ../case2

  $ hg up -qr 1

  $ hg rebase

  saved backup bundle to $TESTTMP/case2/.hg/strip-backup/40039acb7ca5-backup.hg (glob)

  $ hg tglog

  @  3: 'b1' b

  |

  | o  2: 'c1' c

  | |

  o |  1: 'b2' b

  |/

  o  0: '0'

rebase 'c1' to the branch head 'c2' that is closed

  $ hg branch -qf c

  $ hg ci -qm 'c2 closed' --close

  $ hg up -qr 2

  $ hg tglog

  o  4: 'c2 closed' c

  |

  o  3: 'b1' b

  |

  | @  2: 'c1' c

  | |

  o |  1: 'b2' b

  |/

  o  0: '0'

  $ hg rebase

  nothing to rebase - working directory parent is also destination

  [1]

  $ hg tglog

  o  4: 'c2 closed' c

  |

  o  3: 'b1' b

  |

  | @  2: 'c1' c

  | |

  o |  1: 'b2' b

  |/

  o  0: '0'

  $ cd ..