Differences between revisions 1 and 15 (spanning 14 versions)
⇤ ← Revision 1 as of 2016-12-21 21:37:04 →
Size: 1785
Editor: JunWu
Comment:
← Revision 15 as of 2017-03-09 19:57:24 → ⇥
Size: 3110
Editor: Pierre-YvesDavid
Comment:
Deletions are marked like this. Additions are marked like this.
Line 1: Line 1:
= Rebase with changesets in rebaseset = ## page was renamed from ChangesetEvolutionDevelRebase
= Rebase with obsoleted changesets in rebaseset =
Line 6: Line 7:

It needs merging with [[ChangesetEvolutionDevel#Using_Obsolescence_Marker_during_Rebase|existing info regarding rebase on the devel page]]
Line 14: Line 17:
  Z F (F: unstable)
  |   |
  D'  D (D: replaced by D')
  |  /		   Z E # E: unstable
  | |
 D' D # D: replaced by D'
  | |
Line 26: Line 29:
  F'   E'
Line 40: Line 43:
      E       E # E: unstable
Line 49: Line 52:
 * Option 1: {{{rebase -s C -d Z}}} creates new markers, avoid potential merge conflicts (in case the user knows there will be a conflict and wants to edit D"' before rebase E').  * Option 1 (rebase markers): {{{rebase -s C -d Z}}} creates new markers, avoid potential merge conflicts (in case the user knows there will be a conflict and wants to edit D"' before rebase E'). Like Option 5, plus creating new markers. The main concern is marker explosion.
Line 54: Line 57:
  D"' D" # D": replaced by D"'   D" D"' # D": replaced by D"'
Line 63: Line 66:
 * Option 2: {{{rebase -s C -d Z}}} auto rebases E' to D"', does not create D", and does not create new markers. Like running "hg evolve" after Option 1.  * Option 2 (skip troublemakers): {{{rebase -s C -d Z (with some flag?)}}} skips {{{precursors(rebaseset)::}}} in rebaseset. In the example case, E remains at the old position. The user need to run another {{{rebase -s E -d D"'}}} to move E. There is no {{{D"}}} like Option 1 so the user cannot create divergence easily and conflict of rebasing E can be handled later. The downside is not intuitive - users may expect C to be "extinct" (i.e. not shown up in {{{hg sl}}}) after {{{rebase -s C -d ...}}}.

{{{

    D"'
    |
    C'E # E: unstable
   / /
  Z D D' # D: replaced by D'; D': replaced by D"'
  | |/
  B C # C: replaced by C'
  |/
  A
}}}

 * Option 3 (evolve): {{{rebase -s C -d Z --evolve}}} auto rebases E' to D"', does not create D", and does not create new markers. Like running "hg evolve" after Option 1. This is consistent with the {{{--evolve}}} flag below.
Line 68: Line 86:
    D"     D"'
Line 77: Line 95:

* Option 3 (not ideal): {{{rebase -s C -d Z}}} aborts (current default behavior)
 * Option 4 (not ideal): {{{rebase -s C -d Z}}} creates divergence (current behavior with experimental.allowdivergence=1)		  * Option 4 (current behavior, not ideal): {{{rebase -s C -d Z}}} aborts
 * Option 5 (current behavior with {{{experimental.allowdivergence=1}}}, not ideal): {{{rebase -s C -d Z}}} creates divergence
Line 85: Line 102:
      E       E # E: unstable
Line 96: Line 113:
  * Option 3: (Do we have other options) ?   * Option 3: {{{rebase -s C -d Z --evolve}}} rebases roots to destination and evolves others

{{{
C'E'
| |
Z D'
 \|
  B
  |
  A
}}}
Line 100: Line 128:
Mostly about how to deal with the "Successor is also in a rebase set" case.
Line 101: Line 131:
 * https://bz.mercurial-scm.org/5300

----
CategoryDeveloper CategoryEvolution

Rebase with obsoleted changesets in rebaseset

/!\ This page is intended for developer

This page collects situations and discussion about rebase where the rebaseset contains obsoleted changesets.

It needs merging with existing info regarding rebase on the devel page

Contents

  1. Rebase with obsoleted changesets in rebaseset
    1. Situations
    2. Related issues

Situations

Successor is an ancestor of dest

  Z E # E: unstable
  | |
 D' D # D: replaced by D'
  | |
  B C
  |/
  A

  • rebase -s C -d Z can just skip D 

  E'
  |
  C'
  |
  Z 
  | 
  ~

Successor is also in a rebase set

This is probably the most interesting one. 

      E  # E: unstable
      |
  Z D D' # D: replaced by D'
  | |/
  B C
  |/
  A

  • Option 1 (rebase markers): rebase -s C -d Z creates new markers, avoid potential merge conflicts (in case the user knows there will be a conflict and wants to edit D"' before rebase E'). Like Option 5, plus creating new markers. The main concern is marker explosion. 

      E'
      |
   D" D"' # D": replaced by D"'
    |/
    C'
   /
  Z
  |
  ~

  • Option 2 (skip troublemakers): rebase -s C -d Z (with some flag?) skips precursors(rebaseset):: in rebaseset. In the example case, E remains at the old position. The user need to run another rebase -s E -d D"' to move E. There is no D" like Option 1 so the user cannot create divergence easily and conflict of rebasing E can be handled later. The downside is not intuitive - users may expect C to be "extinct" (i.e. not shown up in hg sl) after rebase -s C -d .... 

    D"'
    |
    C'E # E: unstable
   / /
  Z D D' # D: replaced by D'; D': replaced by D"'
  | |/
  B C # C: replaced by C'
  |/
  A

  • Option 3 (evolve): rebase -s C -d Z --evolve auto rebases E' to D"', does not create D", and does not create new markers. Like running "hg evolve" after Option 1. This is consistent with the --evolve flag below. 

    E'
    |
    D"'
    |
    C'
   /
  Z
  |
  ~

  • Option 4 (current behavior, not ideal): rebase -s C -d Z aborts

  • Option 5 (current behavior with experimental.allowdivergence=1, not ideal): rebase -s C -d Z creates divergence

Successor is in other places

      E # E: unstable
      |
Z D'  D # D: replaced by D'
 \|  /
  B C
  |/
  A

  • Option 1: rebase -s C -d Z aborts (current default behavior)

  • Option 2: rebase -s C -d Z creates diverange (with experimental.allowdivergence=True)

  • Option 3: rebase -s C -d Z --evolve rebases roots to destination and evolves others 

C'E'
| |
Z D'
 \|
  B
  |
  A

Mostly about how to deal with the "Successor is also in a rebase set" case.

CategoryDeveloper CategoryEvolution

CEDRebase (last edited 2017-08-31 18:50:17 by JunWu)