1 

     2 

     3 

     4 Initial setup

     5 

     6   $ . $TESTDIR/_exc-util.sh

     7 

     8 

     9 === A.6 between existing changeset ===

    10 

    11 .. {{{

    12 ..   A ◕⇠● B

    13 ..     |/

    14 ..     ● O

    15 .. }}}

    16 ..

    17 .. Marker exist from:

    18 ..

    19 ..  * `A◕⇠● B`

    20 ..

    21 .. Command run:

    22 ..

    23 ..  * hg push -r B

    24 ..  * hg push

    25 ..

    26 .. Expected exchange:

    27 ..

    28 ..  * `A◕⇠● B`

    29 

    30 

    31 initial

    32 

    33   $ setuprepos A.6

    34   creating test repo for test case A.6

    35   - pulldest

    36   - main

    37   - pushdest

    38   cd into `main` and proceed with env setup

    39   $ cd main

    40   $ mkcommit A0

    41   $ hg update -q 0

    42   $ mkcommit A1

    43   created new head

    44 

    45 make both changeset known remotly

    46 

    47   $ hg push -qf ../pushdest

    48   $ hg push -qf ../pulldest

    49 

    50 create a marker after this

    51 

    52   $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`

    53   $ hg log -G --hidden

    54   @  e5ea8f9c7314 (draft): A1

    55   |

    56   | x  28b51eb45704 (draft): A0

    57   |/

    58   o  a9bdc8b26820 (public): O

    59   

    60   $ hg debugobsolete

    61   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}

    62   $ cd ..

    63   $ cd ..

    64 

    65   $ cp -r A.6 A.6.a

    66   $ cp -r A.6 A.6.b

    67 

    68 Actual Test (explicit push version)

    69 -----------------------------------

    70 

    71   $ dotest A.6.a A1

    72   ## Running testcase A.6.a

    73   # testing echange of "A1" (e5ea8f9c7314)

    74   ## initial state

    75   # obstore: main

    76   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}

    77   # obstore: pushdest

    78   # obstore: pulldest

    79   ## pushing "A1" from main to pushdest

    80   pushing to pushdest

    81   searching for changes

    82   no changes found

    83   OBSEXC: computing relevant nodes

    84   OBSEXC: computing markers relevant to 2 nodes

    85   OBSEXC: encoding 1 markers

    86   OBSEXC: sending 1 pushkey payload (78 bytes)

    87   OBSEXC: DONE

    88   ## post push state

    89   # obstore: main

    90   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}

    91   # obstore: pushdest

    92   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}

    93   # obstore: pulldest

    94   ## pulling "e5ea8f9c7314" from main into pulldest

    95   pulling from main

    96   no changes found

    97   OBSEXC: pull obsolescence markers

    98   OBSEXC: merging obsolescence markers (62 bytes)

    99   OBSEXC: 1 markers added

   100   OBSEXC: DONE

   101   ## post pull state

   102   # obstore: main

   103   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}

   104   # obstore: pushdest

   105   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}

   106   # obstore: pulldest

   107   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}

   108 

   109 Actual Test (bare push version)

   110 -----------------------------------

   111 

   112   $ dotest A.6.b

   113   ## Running testcase A.6.b

   114   ## initial state

   115   # obstore: main

   116   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}

   117   # obstore: pushdest

   118   # obstore: pulldest

   119   ## pushing from main to pushdest

   120   pushing to pushdest

   121   searching for changes

   122   no changes found

   123   OBSEXC: computing relevant nodes

   124   OBSEXC: computing markers relevant to 3 nodes

   125   OBSEXC: encoding 1 markers

   126   OBSEXC: sending 1 pushkey payload (78 bytes)

   127   OBSEXC: DONE

   128   ## post push state

   129   # obstore: main

   130   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}

   131   # obstore: pushdest

   132   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}

   133   # obstore: pulldest

   134   ## pulling from main into pulldest

   135   pulling from main

   136   searching for changes

   137   no changes found

   138   OBSEXC: pull obsolescence markers

   139   OBSEXC: merging obsolescence markers (62 bytes)

   140   OBSEXC: 1 markers added

   141   OBSEXC: DONE

   142   ## post pull state

   143   # obstore: main

   144   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}

   145   # obstore: pushdest

   146   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}

   147   # obstore: pulldest

   148   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}