1 

     2 

     3 

     4 Initial setup

     5 

     6   $ . $TESTDIR/testlib/exchange-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 in remote

    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 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

    62   $ hg debugobsrelsethashtree

    63   a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000

    64   28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0000000000000000000000000000000000000000

    65   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 3bc2ee626e11a7cf8fee7a66d069271e17d5a597

    66   $ hg debugobshashrange --subranges --rev 'head()'

    67            rev         node        index         size        depth      obshash

    68              2 e5ea8f9c7314            0            2            2 3bc2ee626e11

    69              0 a9bdc8b26820            0            1            1 000000000000

    70              2 e5ea8f9c7314            1            1            2 3bc2ee626e11

    71   $ cd ..

    72   $ cd ..

    73 

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

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

    76 

    77 Actual Test (explicit push version)

    78 -----------------------------------

    79 

    80   $ dotest A.6.a A1

    81   ## Running testcase A.6.a

    82   # testing echange of "A1" (e5ea8f9c7314)

    83   ## initial state

    84   # obstore: main

    85   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

    86   # obstore: pushdest

    87   # obstore: pulldest

    88   ## pushing "A1" from main to pushdest

    89   pushing to pushdest

    90   searching for changes

    91   no changes found

    92   remote: 1 new obsolescence markers

    93   ## post push state

    94   # obstore: main

    95   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

    96   # obstore: pushdest

    97   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

    98   # obstore: pulldest

    99   ## pulling "e5ea8f9c7314" from main into pulldest

   100   pulling from main

   101   no changes found

   102   1 new obsolescence markers

   103   ## post pull state

   104   # obstore: main

   105   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

   106   # obstore: pushdest

   107   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

   108   # obstore: pulldest

   109   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

   110 

   111 Actual Test (bare push version)

   112 -------------------------------

   113 

   114   $ dotest A.6.b

   115   ## Running testcase A.6.b

   116   ## initial state

   117   # obstore: main

   118   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

   119   # obstore: pushdest

   120   # obstore: pulldest

   121   ## pushing from main to pushdest

   122   pushing to pushdest

   123   searching for changes

   124   no changes found

   125   remote: 1 new obsolescence markers

   126   ## post push state

   127   # obstore: main

   128   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

   129   # obstore: pushdest

   130   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

   131   # obstore: pulldest

   132   ## pulling from main into pulldest

   133   pulling from main

   134   searching for changes

   135   no changes found

   136   1 new obsolescence markers

   137   ## post pull state

   138   # obstore: main

   139   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

   140   # obstore: pushdest

   141   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

   142   # obstore: pulldest

   143   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}