#chg-compatible
  $ setconfig experimental.allowfilepeer=True

  $ disable treemanifest
  $ enable undo rebase

  $ hg init a
  $ cd a
  $ echo c1 >common
  $ hg add common
  $ hg ci -m C1

  $ echo c2 >>common
  $ hg ci -m C2

  $ echo c3 >>common
  $ hg ci -m C3

  $ hg up -q -C 'desc(C2)'

  $ echo l1 >>extra
  $ hg add extra
  $ hg ci -m L1

  $ sed -e 's/c2/l2/' common > common.new
  $ mv common.new common
  $ hg ci -m L2

  $ echo l3 >> extra2
  $ hg add extra2
  $ hg ci -m L3
  $ hg bookmark mybook

  $ tglogp
  @  8029388f38dc draft 'L3' mybook
  │
  o  46f0b057b5c0 draft 'L2'
  │
  o  3163e20567cc draft 'L1'
  │
  │ o  a9ce13b75fb5 draft 'C3'
  ├─╯
  o  11eb9c356adf draft 'C2'
  │
  o  178f1774564f draft 'C1'
  
Try to call --continue:

  $ hg rebase --continue
  abort: no rebase in progress
  [255]

Conflicting rebase:

  $ hg rebase -s 'desc(L1)' -d 'desc(C3)'
  rebasing 3163e20567cc "L1"
  rebasing 46f0b057b5c0 "L2"
  merging common
  warning: 1 conflicts while merging common! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
  [1]

  $ hg status --config commands.status.verbose=1
  M common
  ? common.orig
  # The repository is in an unfinished *rebase* state.
  
  # Unresolved merge conflicts:
  # 
  #     common
  # 
  # To mark files as resolved:  hg resolve --mark FILE
  
  # To continue:                hg rebase --continue
  # To abort:                   hg rebase --abort
  

Try to continue without solving the conflict:

  $ hg rebase --continue
  abort: unresolved merge conflicts (see 'hg help resolve')
  [255]

Conclude rebase:

  $ echo 'resolved merge' >common
  $ hg resolve -m common
  (no more unresolved files)
  continue: hg rebase --continue
  $ hg continue
  already rebased 3163e20567cc "L1" as 3e046f2ecedb
  rebasing 46f0b057b5c0 "L2"
  rebasing 8029388f38dc "L3" (mybook)

  $ tglogp
  @  d67b21408fc0 draft 'L3' mybook
  │
  o  5e5bd08c7e60 draft 'L2'
  │
  o  3e046f2ecedb draft 'L1'
  │
  o  a9ce13b75fb5 draft 'C3'
  │
  o  11eb9c356adf draft 'C2'
  │
  o  178f1774564f draft 'C1'
  
Check correctness:

  $ hg cat -r 'desc(C1)' common
  c1

  $ hg cat -r 'desc(C2)' common
  c1
  c2

  $ hg cat -r 'desc(C3)' common
  c1
  c2
  c3

  $ hg cat -r 'desc(L1)' common
  c1
  c2
  c3

  $ hg cat -r 'desc(L2)' common
  resolved merge

  $ hg cat -r 'desc(L3)' common
  resolved merge

Bookmark stays active after --continue
  $ hg bookmarks
   * mybook                    d67b21408fc0

  $ cd ..

Check that the right ancestors is used while rebasing a merge (issue4041)

  $ hg clone --no-shallow "$TESTDIR/bundles/issue4041.hg" issue4041
  requesting all changes
  adding changesets
  adding manifests
  adding file changes
  updating to branch f1
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ cd issue4041
  $ hg up -q 'head() - merge()'
  $ hg log -G
  o    commit:      2f2496ddf49d
  ├─╮  branch:      f1
  │ │  user:        szhang
  │ │  date:        Thu Sep 05 12:59:39 2013 -0400
  │ │  summary:     merge
  │ │
  │ o  commit:      4c9fbe56a16f
  │ │  branch:      f1
  │ │  user:        szhang
  │ │  date:        Thu Sep 05 12:54:00 2013 -0400
  │ │  summary:     changed f1
  │ │
  o │  commit:      e31216eec445
  │ │  branch:      f1
  │ │  user:        szhang
  │ │  date:        Thu Sep 05 12:59:10 2013 -0400
  │ │  summary:     more changes to f1
  │ │
  o │  commit:      8e4e2c1a07ae
  ├─╮  branch:      f1
  │ │  user:        szhang
  │ │  date:        Thu Sep 05 12:57:59 2013 -0400
  │ │  summary:     bad merge
  │ │
  o │  commit:      400110238667
  │ │  branch:      f2
  │ │  user:        szhang
  │ │  date:        Tue Sep 03 13:58:02 2013 -0400
  │ │  summary:     changed f2 on f2
  │ │
  o │  commit:      12e8ec6bb010
  │ │  branch:      f2
  │ │  user:        szhang
  │ │  date:        Tue Sep 03 13:57:18 2013 -0400
  │ │  summary:     created f2 branch
  │ │
  │ o  commit:      4bc80088dc6b
  │ │  branch:      f1
  │ │  user:        szhang
  │ │  date:        Tue Sep 03 13:56:20 2013 -0400
  │ │  summary:     added f1.txt
  │ │
  │ o  commit:      ef53c9e6b608
  │ │  branch:      f1
  │ │  user:        szhang
  │ │  date:        Tue Sep 03 13:55:26 2013 -0400
  │ │  summary:     created f1 branch
  │ │
  │ │ @  commit:      d79e2059b5c0
  ├───╯  user:        szhang
  │ │    date:        Tue Sep 03 13:57:39 2013 -0400
  │ │    summary:     changed f2 on default
  │ │
  o │  commit:      8a951942e016
  ├─╯  user:        szhang
  │    date:        Tue Sep 03 13:57:11 2013 -0400
  │    summary:     added f2.txt
  │
  o  commit:      24797d4f68de
     user:        szhang
     date:        Tue Sep 03 13:55:08 2013 -0400
     summary:     added default.txt
  
  $ hg rebase -s 'desc("more changes to f1")' -d 'desc("added f1.tx")' --debug # use debug to really check merge base used
  rebase onto 4bc80088dc6b starting from e31216eec445
  rebasing on disk
  rebase status stored
  rebasing e31216eec445 "more changes to f1"
   future parents are 4bc80088dc6b and 000000000000
  rebase status stored
   update to 4bc80088dc6b
  resolving manifests
   branchmerge: False, force: True, partial: False
   ancestor: d79e2059b5c0+, local: d79e2059b5c0+, remote: 4bc80088dc6b
   f2.txt: other deleted -> r
  removing f2.txt
   f1.txt: remote created -> g
  getting f1.txt
   merge against e31216eec445
     detach base 8e4e2c1a07ae
    searching for copies back to 8a951942e016
    unmatched files in other (from topological common ancestor):
     f2.txt
  resolving manifests
   branchmerge: True, force: True, partial: False
   ancestor: 8e4e2c1a07ae, local: 4bc80088dc6b+, remote: e31216eec445
   f1.txt: remote is newer -> g
  getting f1.txt
  committing files:
  f1.txt
  committing manifest
  committing changelog
  rebased as 19c888675e13
  rebasing 2f2496ddf49d "merge"
   future parents are 19c888675e13 and 4c9fbe56a16f
  rebase status stored
   already in destination
   merge against 2f2496ddf49d
     detach base e31216eec445
    searching for copies back to 8a951942e016
    unmatched files in other (from topological common ancestor):
     f2.txt
  resolving manifests
   branchmerge: True, force: True, partial: False
   ancestor: e31216eec445, local: 19c888675e13+, remote: 2f2496ddf49d
   f1.txt: remote is newer -> g
  getting f1.txt
  committing files:
  f1.txt
  committing manifest
  committing changelog
  rebased as 2a7f09cac94c
  rebase merging completed
  update back to initial working directory parent
  resolving manifests
   branchmerge: False, force: False, partial: False
   ancestor: 2a7f09cac94c, local: 2a7f09cac94c+, remote: d79e2059b5c0
   f1.txt: other deleted -> r
  removing f1.txt
   f2.txt: remote created -> g
  getting f2.txt
  rebase completed

Test minimization of merge conflicts
  $ hg up -q null
  $ echo a > a
  $ hg add a
  $ hg commit -q -m 'a'
  $ echo b >> a
  $ hg commit -q -m 'ab'
  $ hg bookmark ab
  $ hg up -q '.^'
  $ echo b >> a
  $ echo c >> a
  $ hg commit -q -m 'abc'
  $ hg rebase -s 7bc217434fc1 -d ab --keep
  rebasing 7bc217434fc1 "abc"
  merging a
  warning: 1 conflicts while merging a! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
  [1]
  $ hg diff
  diff -r 328e4ab1f7cc a
  --- a/a	Thu Jan 01 00:00:00 1970 +0000
  +++ b/a	* (glob)
  @@ -1,2 +1,6 @@
   a
   b
  +<<<<<<< dest:   328e4ab1f7cc ab - test: ab
  +=======
  +c
  +>>>>>>> source: 7bc217434fc1 - test: abc
  $ hg rebase --abort
  rebase aborted
  $ hg up -q -C 7bc217434fc1
  $ hg rebase -s . -d ab --keep -t internal:merge3
  rebasing 7bc217434fc1 "abc"
  merging a
  warning: 1 conflicts while merging a! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
  [1]
  $ hg diff
  diff -r 328e4ab1f7cc a
  --- a/a	Thu Jan 01 00:00:00 1970 +0000
  +++ b/a	* (glob)
  @@ -1,2 +1,8 @@
   a
  +<<<<<<< dest:   328e4ab1f7cc ab - test: ab
   b
  +||||||| base
  +=======
  +b
  +c
  +>>>>>>> source: 7bc217434fc1 - test: abc

Test rebase with obsstore turned on and off (issue5606)

  $ cd $TESTTMP
  $ hg init b
  $ cd b
  $ hg debugdrawdag <<'EOS'
  > D
  > |
  > C
  > |
  > B E
  > |/
  > A
  > EOS

  $ hg update E -q
  $ echo 3 > B
  $ hg commit --amend -m E -A B -q
  $ hg rebase -r B+D -d . --config experimental.evolution=true
  rebasing 112478962961 "B" (B)
  merging B
  warning: 1 conflicts while merging B! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
  [1]

  $ echo 4 > B
  $ hg resolve -m
  (no more unresolved files)
  continue: hg rebase --continue
  $ hg rebase --continue --config experimental.evolution=none
  rebasing 112478962961 "B" (B)
  rebasing f585351a92f8 "D" (D)

  $ tglogp
  o  c5f6f5f52dbd draft 'D' D
  │
  o  a8990ee99807 draft 'B' B
  │
  @  b2867df0c236 draft 'E' E
  │
  │ o  26805aba1e60 draft 'C' C
  │ │
  │ x  112478962961 draft 'B'
  ├─╯
  o  426bada5c675 draft 'A' A