tests/test-exchange-B6.t
branchmercurial-4.0
changeset 2278 2db189baf8b7
parent 2260 e200dbfb4515
parent 2277 61d885899466
child 2279 347849e17876
child 2318 523855eb28c1
equal deleted inserted replaced
2260:e200dbfb4515 2278:2db189baf8b7
     1 
       
     2 
       
     3 
       
     4 
       
     5 Initial setup
       
     6 
       
     7   $ . $TESTDIR/testlib/exchange-util.sh
       
     8 
       
     9 == B.6 Pruned changeset with ancestors not in pushed set ===
       
    10 
       
    11 .. {{{
       
    12 ..   B ø⇠⊗ B'
       
    13 ..     | |
       
    14 ..   A ○ |
       
    15 ..     |/
       
    16 ..     ● O
       
    17 .. }}}
       
    18 ..
       
    19 .. Marker exist from:
       
    20 ..
       
    21 ..  * `Bø⇠⊗ B'`
       
    22 ..  * B' prune
       
    23 ..
       
    24 .. Command run:
       
    25 ..
       
    26 ..  * hg push -r O
       
    27 ..
       
    28 .. Expected exchange:
       
    29 ..
       
    30 ..  * `Bø⇠⊗ B'`
       
    31 ..  * B' prune
       
    32 
       
    33   $ setuprepos B.6
       
    34   creating test repo for test case B.6
       
    35   - pulldest
       
    36   - main
       
    37   - pushdest
       
    38   cd into `main` and proceed with env setup
       
    39   $ cd main
       
    40   $ mkcommit A
       
    41   $ mkcommit B0
       
    42   $ hg up --quiet 0
       
    43   $ mkcommit B1
       
    44   created new head
       
    45   $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
       
    46   $ hg prune -qd '0 0' .
       
    47   $ hg log -G --hidden
       
    48   x  f6298a8ac3a4 (draft): B1
       
    49   |
       
    50   | x  962ecf6b1afc (draft): B0
       
    51   | |
       
    52   | o  f5bc6836db60 (draft): A
       
    53   |/
       
    54   @  a9bdc8b26820 (public): O
       
    55   
       
    56   $ hg debugobsolete
       
    57   962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
       
    58   f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
       
    59   $ hg debugobsrelsethashtree
       
    60   a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 86e41541149f4b6cccc5fd131d744d8e83a681e5
       
    61   f5bc6836db60e308a17ba08bf050154ba9c4fad7 f2e05412d3f1d5bc1ae647cf9efc43e0399c26ca
       
    62   962ecf6b1afc94e15c7e48fdfb76ef8abd11372b 974507d1c466d0aa86d288836194339ed3b98736
       
    63   f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 04e03a8959d8a39984e6a8f4a16fba975b364747
       
    64   $ hg debugobshashrange --subranges --rev 'head()'
       
    65            rev         node        index         size        depth      obshash
       
    66              1 f5bc6836db60            0            2            2 000000000000
       
    67              0 a9bdc8b26820            0            1            1 86e41541149f
       
    68              1 f5bc6836db60            1            1            2 000000000000
       
    69   $ cd ..
       
    70   $ cd ..
       
    71 
       
    72 Actual Test
       
    73 -------------------------------------
       
    74 
       
    75   $ dotest B.6 O
       
    76   ## Running testcase B.6
       
    77   # testing echange of "O" (a9bdc8b26820)
       
    78   ## initial state
       
    79   # obstore: main
       
    80   962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
       
    81   f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
       
    82   # obstore: pushdest
       
    83   # obstore: pulldest
       
    84   ## pushing "O" from main to pushdest
       
    85   pushing to pushdest
       
    86   searching for changes
       
    87   no changes found
       
    88   remote: 2 new obsolescence markers
       
    89   ## post push state
       
    90   # obstore: main
       
    91   962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
       
    92   f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
       
    93   # obstore: pushdest
       
    94   962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
       
    95   f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
       
    96   # obstore: pulldest
       
    97   ## pulling "a9bdc8b26820" from main into pulldest
       
    98   pulling from main
       
    99   no changes found
       
   100   2 new obsolescence markers
       
   101   ## post pull state
       
   102   # obstore: main
       
   103   962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
       
   104   f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
       
   105   # obstore: pushdest
       
   106   962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
       
   107   f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
       
   108   # obstore: pulldest
       
   109   962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
       
   110   f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
       
   111