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-D1.t
branchmercurial-4.3
changeset 3591 98941c28f3e2
parent 3590 d5adce52cef4
parent 3100 ccfcacc5ee7c
child 3592 7a5c3175015e
child 3716 e5ba6531503e
equal deleted inserted replaced
3590:d5adce52cef4 3591:98941c28f3e2 
    72   
    72   
    73   $ inspect_obsmarkers
 
    73   $ inspect_obsmarkers
 
    74   obsstore content
 
    74   obsstore content
 
    75   ================
 
    75   ================
 
    76   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
    76   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
    77   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
    77   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
    78   obshashtree
 
    78   obshashtree
 
    79   ===========
 
    79   ===========
 
    80   a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
 
    80   a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
 
    81   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 945a85093e28fbda8065db6933af09acd8d22524
 
    81   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 289cb0d058c81c763eca8bb438657dba9a7ba646
 
    82   obshashrange
 
    82   obshashrange
 
    83   ============
 
    83   ============
 
    84            rev         node        index         size        depth      obshash
 
    84            rev         node        index         size        depth      obshash
 
    85              1 e5ea8f9c7314            0            2            2 945a85093e28
 
    85              1 e5ea8f9c7314            0            2            2 289cb0d058c8
 
    86              0 a9bdc8b26820            0            1            1 000000000000
 
    86              0 a9bdc8b26820            0            1            1 000000000000
 
    87              1 e5ea8f9c7314            1            1            2 945a85093e28
 
    87              1 e5ea8f9c7314            1            1            2 289cb0d058c8
 
    88   $ cd ..
 
    88   $ cd ..
 
    89   $ cd ..
 
    89   $ cd ..
 
    90 
    90 
    91   $ cp -R D.1 D.1.a
 
    91   $ cp -R D.1 D.1.a
 
    92   $ cp -R D.1 D.1.b
 
    92   $ cp -R D.1 D.1.b
 
    97   $ dotest D.1.a A1
 
    97   $ dotest D.1.a A1
 
    98   ## Running testcase D.1.a
 
    98   ## Running testcase D.1.a
 
    99   # testing echange of "A1" (e5ea8f9c7314)
 
    99   # testing echange of "A1" (e5ea8f9c7314)
 
   100   ## initial state
 
   100   ## initial state
 
   101   # obstore: main
 
   101   # obstore: main
 
   102   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   102   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   103   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   103   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   104   # obstore: pushdest
 
   104   # obstore: pushdest
 
   105   # obstore: pulldest
 
   105   # obstore: pulldest
 
   106   ## pushing "A1" from main to pushdest
 
   106   ## pushing "A1" from main to pushdest
 
   107   pushing to pushdest
 
   107   pushing to pushdest
 
   111   remote: adding file changes
 
   111   remote: adding file changes
 
   112   remote: added 1 changesets with 1 changes to 1 files
 
   112   remote: added 1 changesets with 1 changes to 1 files
 
   113   remote: 2 new obsolescence markers
 
   113   remote: 2 new obsolescence markers
 
   114   ## post push state
 
   114   ## post push state
 
   115   # obstore: main
 
   115   # obstore: main
 
   116   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   116   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   117   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   117   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   118   # obstore: pushdest
 
   118   # obstore: pushdest
 
   119   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   119   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   120   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   120   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   121   # obstore: pulldest
 
   121   # obstore: pulldest
 
   122   ## pulling "e5ea8f9c7314" from main into pulldest
 
   122   ## pulling "e5ea8f9c7314" from main into pulldest
 
   123   pulling from main
 
   123   pulling from main
 
   124   searching for changes
 
   124   searching for changes
 
   125   adding changesets
 
   125   adding changesets
 
   126   adding manifests
 
   126   adding manifests
 
   127   adding file changes
 
   127   adding file changes
 
   128   added 1 changesets with 1 changes to 1 files
 
   128   added 1 changesets with 1 changes to 1 files
 
   129   2 new obsolescence markers
 
   129   2 new obsolescence markers
 
   130   new changesets e5ea8f9c7314
 
       
   131   (run 'hg update' to get a working copy)
 
   130   (run 'hg update' to get a working copy)
 
   132   ## post pull state
 
   131   ## post pull state
 
   133   # obstore: main
 
   132   # obstore: main
 
   134   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   133   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   135   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   134   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   136   # obstore: pushdest
 
   135   # obstore: pushdest
 
   137   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   136   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   138   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   137   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   139   # obstore: pulldest
 
   138   # obstore: pulldest
 
   140   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   139   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   141   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   140   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   142 
   141 
   143 Actual Test (base push)
 
   142 Actual Test (base push)
 
   144 ---------------------------
 
   143 ---------------------------
 
   145 
   144 
   146   $ dotest D.1.b
 
   145   $ dotest D.1.b
 
   147   ## Running testcase D.1.b
 
   146   ## Running testcase D.1.b
 
   148   ## initial state
 
   147   ## initial state
 
   149   # obstore: main
 
   148   # obstore: main
 
   150   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   149   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   151   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   150   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   152   # obstore: pushdest
 
   151   # obstore: pushdest
 
   153   # obstore: pulldest
 
   152   # obstore: pulldest
 
   154   ## pushing from main to pushdest
 
   153   ## pushing from main to pushdest
 
   155   pushing to pushdest
 
   154   pushing to pushdest
 
   159   remote: adding file changes
 
   158   remote: adding file changes
 
   160   remote: added 1 changesets with 1 changes to 1 files
 
   159   remote: added 1 changesets with 1 changes to 1 files
 
   161   remote: 2 new obsolescence markers
 
   160   remote: 2 new obsolescence markers
 
   162   ## post push state
 
   161   ## post push state
 
   163   # obstore: main
 
   162   # obstore: main
 
   164   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   163   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   165   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   164   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   166   # obstore: pushdest
 
   165   # obstore: pushdest
 
   167   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   166   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   168   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   167   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   169   # obstore: pulldest
 
   168   # obstore: pulldest
 
   170   ## pulling from main into pulldest
 
   169   ## pulling from main into pulldest
 
   171   pulling from main
 
   170   pulling from main
 
   172   searching for changes
 
   171   searching for changes
 
   173   adding changesets
 
   172   adding changesets
 
   174   adding manifests
 
   173   adding manifests
 
   175   adding file changes
 
   174   adding file changes
 
   176   added 1 changesets with 1 changes to 1 files
 
   175   added 1 changesets with 1 changes to 1 files
 
   177   2 new obsolescence markers
 
   176   2 new obsolescence markers
 
   178   new changesets e5ea8f9c7314
 
       
   179   (run 'hg update' to get a working copy)
 
   177   (run 'hg update' to get a working copy)
 
   180   ## post pull state
 
   178   ## post pull state
 
   181   # obstore: main
 
   179   # obstore: main
 
   182   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   180   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   183   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   181   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   184   # obstore: pushdest
 
   182   # obstore: pushdest
 
   185   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   183   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   186   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   184   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   187   # obstore: pulldest
 
   185   # obstore: pulldest
 
   188   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
 
   186   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   189   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   187   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   190 
   188
evolve