Differences between revisions 1 and 2

List of case and expected behavior when exchanging obsolesence marker

$/!\$ This page is intended for developer

Contents

1. Definition

1. You want all markers **relevant** changeset common between source and destination to be exchanged 2. Marker **relevant to a changeset** are:

?. What shall we do on partial split push…

    o A
    |
    * O

Marker exist from:

Command run:

Expected exchange:

    o B
    |
    o A
    |
    * O

Marker exist from:

Command run:

Expected exchange:

-  ⇤ ← Revision 1 as of 2014-01-24 00:34:46 → 
  Size: 251
  Editor: Pierre-YvesDavid
  Comment:
+   ← Revision 2 as of 2014-01-24 01:44:45 → ⇥
  Size: 1145
  Editor: Pierre-YvesDavid
  Comment:
-Deletions are marked like this.
+Additions are marked like this.
 Line 9:
-== Simple Case ==
+== Definition ==


1. You want all markers **relevant** changeset common between source and
destination to be exchanged
2. Marker **relevant to a changeset** are:

  * marker that use this changeset as successors
  * prune marker of direct children on this changeset.
  * recursive application of the two rules on successors store in those marker

?. What shall we do on partial split push…

== A. Simple Case ==

=== A.1 pushing a single heads  ===
-Line 13:
+Line 28:
-== Deletion Case ==
-Line 15:
+Line 29:
+==== A.1.1 pushing a single head  ====
-Line 16:
+Line 31:
-== Advance Case ==
+{{{
    o A
    |
    * O
}}}
-Line 18:
+Line 37:
-== Partial Information Case ==
+Marker exist from:

 * A

Command run:

 * hg push -r A
 * hg push

Expected exchange:

 * chain from A

==== A.1.2 pushing a multiple changeset into a single head  ====

{{{
    o B
    |
    o A
    |
    * O
}}}

Marker exist from:

 * A

Command run:

 * hg push -r A
 * hg push

Expected exchange:

 * chain from A

== B. Deletion Case ==

== C. Advance Case ==

== D. Partial Information Case ==