Mercurial Mercurial > pub > hg > evolve / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-exchange-obsmarkers-case-C1.t
branchmercurial-4.3
changeset 3591 98941c28f3e2
parent 3566 e6bea259c227
parent 3106 a867d59ea97a
child 3592 7a5c3175015e
child 3716 e5ba6531503e
equal deleted inserted replaced
3590:d5adce52cef4 3591:98941c28f3e2 
    56   cd into `main` and proceed with env setup
 
    56   cd into `main` and proceed with env setup
 
    57   $ cd main
 
    57   $ cd main
 
    58   $ mkcommit A
 
    58   $ mkcommit A
 
    59   $ mkcommit B
 
    59   $ mkcommit B
 
    60   $ hg prune -qd '0 0' '.~1'
 
    60   $ hg prune -qd '0 0' '.~1'
 
    61   1 new orphan changesets
 
    61   1 new unstable changesets
 
    62   $ hg prune -qd '0 0' .
 
    62   $ hg prune -qd '0 0' .
 
    63   $ hg log -G --hidden
 
    63   $ hg log -G --hidden
 
    64   x  f6fbb35d8ac9 (draft): B
 
    64   x  f6fbb35d8ac9 (draft): B
 
    65   |
 
    65   |
 
    66   x  f5bc6836db60 (draft): A
 
    66   x  f5bc6836db60 (draft): A
 
    68   @  a9bdc8b26820 (public): O
 
    68   @  a9bdc8b26820 (public): O
 
    69   
    69   
    70   $ inspect_obsmarkers
 
    70   $ inspect_obsmarkers
 
    71   obsstore content
 
    71   obsstore content
 
    72   ================
 
    72   ================
 
    73   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
    73   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
    74   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
    74   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
    75   obshashtree
 
    75   obshashtree
 
    76   ===========
 
    76   ===========
 
    77   a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 4e4b1659570cc47f1bdabfa3497e6f2d2b046ad5
 
    77   a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 1ce18e5a71f78d443a80c819f2f7197c4706af70
 
    78   f5bc6836db60e308a17ba08bf050154ba9c4fad7 b850046e0c6894550e08fff1bdd1e0a597767183
 
    78   f5bc6836db60e308a17ba08bf050154ba9c4fad7 5c3c935df6f4007c633c3386d6f58b22c274809e
 
    79   f6fbb35d8ac958bbe70035e4c789c18471cdc0af b80529986a1201fd5306200ce6a19150fad97a2a
 
    79   f6fbb35d8ac958bbe70035e4c789c18471cdc0af bccb3d243420ef26782fa11f209830db360c34b2
 
    80   obshashrange
 
    80   obshashrange
 
    81   ============
 
    81   ============
 
    82            rev         node        index         size        depth      obshash
 
    82            rev         node        index         size        depth      obshash
 
    83              0 a9bdc8b26820            0            1            1 4e4b1659570c
 
    83              0 a9bdc8b26820            0            1            1 1ce18e5a71f7
 
    84   $ cd ..
 
    84   $ cd ..
 
    85   $ cd ..
 
    85   $ cd ..
 
    86 
    86 
    87   $ cp -R C.1 C.1.a
 
    87   $ cp -R C.1 C.1.a
 
    88   $ cp -R C.1 C.1.b
 
    88   $ cp -R C.1 C.1.b
 
    93   $ dotest C.1.a O
 
    93   $ dotest C.1.a O
 
    94   ## Running testcase C.1.a
 
    94   ## Running testcase C.1.a
 
    95   # testing echange of "O" (a9bdc8b26820)
 
    95   # testing echange of "O" (a9bdc8b26820)
 
    96   ## initial state
 
    96   ## initial state
 
    97   # obstore: main
 
    97   # obstore: main
 
    98   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
    98   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
    99   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
    99   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   100   # obstore: pushdest
 
   100   # obstore: pushdest
 
   101   # obstore: pulldest
 
   101   # obstore: pulldest
 
   102   ## pushing "O" from main to pushdest
 
   102   ## pushing "O" from main to pushdest
 
   103   pushing to pushdest
 
   103   pushing to pushdest
 
   104   searching for changes
 
   104   searching for changes
 
   105   no changes found
 
   105   no changes found
 
   106   remote: 2 new obsolescence markers
 
   106   remote: 2 new obsolescence markers
 
   107   ## post push state
 
   107   ## post push state
 
   108   # obstore: main
 
   108   # obstore: main
 
   109   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   109   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   110   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   110   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   111   # obstore: pushdest
 
   111   # obstore: pushdest
 
   112   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   112   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   113   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   113   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   114   # obstore: pulldest
 
   114   # obstore: pulldest
 
   115   ## pulling "a9bdc8b26820" from main into pulldest
 
   115   ## pulling "a9bdc8b26820" from main into pulldest
 
   116   pulling from main
 
   116   pulling from main
 
   117   no changes found
 
   117   no changes found
 
   118   2 new obsolescence markers
 
   118   2 new obsolescence markers
 
   119   ## post pull state
 
   119   ## post pull state
 
   120   # obstore: main
 
   120   # obstore: main
 
   121   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   121   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   122   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   122   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   123   # obstore: pushdest
 
   123   # obstore: pushdest
 
   124   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   124   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   125   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   125   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   126   # obstore: pulldest
 
   126   # obstore: pulldest
 
   127   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   127   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   128   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   128   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   129 
   129 
   130 Actual Test (bare push)
 
   130 Actual Test (bare push)
 
   131 -------------------------------------
 
   131 -------------------------------------
 
   132 
   132 
   133   $ dotest C.1.b
 
   133   $ dotest C.1.b
 
   134   ## Running testcase C.1.b
 
   134   ## Running testcase C.1.b
 
   135   ## initial state
 
   135   ## initial state
 
   136   # obstore: main
 
   136   # obstore: main
 
   137   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   137   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   138   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   138   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   139   # obstore: pushdest
 
   139   # obstore: pushdest
 
   140   # obstore: pulldest
 
   140   # obstore: pulldest
 
   141   ## pushing from main to pushdest
 
   141   ## pushing from main to pushdest
 
   142   pushing to pushdest
 
   142   pushing to pushdest
 
   143   searching for changes
 
   143   searching for changes
 
   144   no changes found
 
   144   no changes found
 
   145   remote: 2 new obsolescence markers
 
   145   remote: 2 new obsolescence markers
 
   146   ## post push state
 
   146   ## post push state
 
   147   # obstore: main
 
   147   # obstore: main
 
   148   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   148   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   149   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   149   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   150   # obstore: pushdest
 
   150   # obstore: pushdest
 
   151   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   151   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   152   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   152   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   153   # obstore: pulldest
 
   153   # obstore: pulldest
 
   154   ## pulling from main into pulldest
 
   154   ## pulling from main into pulldest
 
   155   pulling from main
 
   155   pulling from main
 
   156   searching for changes
 
   156   searching for changes
 
   157   no changes found
 
   157   no changes found
 
   158   2 new obsolescence markers
 
   158   2 new obsolescence markers
 
   159   ## post pull state
 
   159   ## post pull state
 
   160   # obstore: main
 
   160   # obstore: main
 
   161   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   161   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   162   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   162   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   163   # obstore: pushdest
 
   163   # obstore: pushdest
 
   164   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   164   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   165   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   165   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   166   # obstore: pulldest
 
   166   # obstore: pulldest
 
   167   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   167   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   168   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   168   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
evolve