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-A3.t
branchmercurial-4.2
changeset 3188 4cc1057970a2
parent 3108 9c9c8c1eeb93
child 3592 7a5c3175015e
equal deleted inserted replaced
3187:68aeeb4d4b8f 3188:4cc1057970a2 
    71   created new head
 
    71   created new head
 
    72   $ hg update -q 0
 
    72   $ hg update -q 0
 
    73   $ mkcommit B1
 
    73   $ mkcommit B1
 
    74   created new head
 
    74   created new head
 
    75   $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
 
    75   $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
 
    76   obsoleted 1 changesets
 
       
    77   $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
 
    76   $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
 
    78   obsoleted 1 changesets
 
       
    79   $ hg log -G --hidden
 
    77   $ hg log -G --hidden
 
    80   @  f6298a8ac3a4 (draft): B1
 
    78   @  f6298a8ac3a4 (draft): B1
 
    81   |
 
    79   |
 
    82   | o  e5ea8f9c7314 (draft): A1
 
    80   | o  e5ea8f9c7314 (draft): A1
 
    83   |/
 
    81   |/
 
    88   o  a9bdc8b26820 (public): O
 
    86   o  a9bdc8b26820 (public): O
 
    89   
    87   
    90   $ inspect_obsmarkers
 
    88   $ inspect_obsmarkers
 
    91   obsstore content
 
    89   obsstore content
 
    92   ================
 
    90   ================
 
    93   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
    91   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
 
    94   6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
    92   6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
 
    95   obshashtree
 
    93   obshashtree
 
    96   ===========
 
    94   ===========
 
    97   a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
 
    95   a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
 
    98   28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0000000000000000000000000000000000000000
 
    96   28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0000000000000000000000000000000000000000
 
    99   6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0000000000000000000000000000000000000000
 
    97   6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0000000000000000000000000000000000000000
 
   116   $ dotest A.3.a A1
 
   114   $ dotest A.3.a A1
 
   117   ## Running testcase A.3.a
 
   115   ## Running testcase A.3.a
 
   118   # testing echange of "A1" (e5ea8f9c7314)
 
   116   # testing echange of "A1" (e5ea8f9c7314)
 
   119   ## initial state
 
   117   ## initial state
 
   120   # obstore: main
 
   118   # obstore: main
 
   121   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   119   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
 
   122   6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   120   6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
 
   123   # obstore: pushdest
 
   121   # obstore: pushdest
 
   124   # obstore: pulldest
 
   122   # obstore: pulldest
 
   125   ## pushing "A1" from main to pushdest
 
   123   ## pushing "A1" from main to pushdest
 
   126   pushing to pushdest
 
   124   pushing to pushdest
 
   127   searching for changes
 
   125   searching for changes
 
   130   remote: adding file changes
 
   128   remote: adding file changes
 
   131   remote: added 1 changesets with 1 changes to 1 files
 
   129   remote: added 1 changesets with 1 changes to 1 files
 
   132   remote: 1 new obsolescence markers
 
   130   remote: 1 new obsolescence markers
 
   133   ## post push state
 
   131   ## post push state
 
   134   # obstore: main
 
   132   # obstore: main
 
   135   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   133   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
 
   136   6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   134   6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
 
   137   # obstore: pushdest
 
   135   # obstore: pushdest
 
   138   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   136   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
 
   139   # obstore: pulldest
 
   137   # obstore: pulldest
 
   140   ## pulling "e5ea8f9c7314" from main into pulldest
 
   138   ## pulling "e5ea8f9c7314" from main into pulldest
 
   141   pulling from main
 
   139   pulling from main
 
   142   searching for changes
 
   140   searching for changes
 
   143   adding changesets
 
   141   adding changesets
 
   146   added 1 changesets with 1 changes to 1 files
 
   144   added 1 changesets with 1 changes to 1 files
 
   147   1 new obsolescence markers
 
   145   1 new obsolescence markers
 
   148   (run 'hg update' to get a working copy)
 
   146   (run 'hg update' to get a working copy)
 
   149   ## post pull state
 
   147   ## post pull state
 
   150   # obstore: main
 
   148   # obstore: main
 
   151   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   149   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
 
   152   6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   150   6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
 
   153   # obstore: pushdest
 
   151   # obstore: pushdest
 
   154   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   152   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
 
   155   # obstore: pulldest
 
   153   # obstore: pulldest
 
   156   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   154   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
 
   157 
   155 
   158 other variant: changeset known in remote
 
   156 other variant: changeset known in remote
 
   159 ----------------------------------------
 
   157 ----------------------------------------
 
   160 
   158 
   161   $ setuprepos A.3.b
 
   159   $ setuprepos A.3.b
 
   174   created new head
 
   172   created new head
 
   175   $ hg update -q 0
 
   173   $ hg update -q 0
 
   176   $ mkcommit B1
 
   174   $ mkcommit B1
 
   177   created new head
 
   175   created new head
 
   178   $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
 
   176   $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
 
   179   obsoleted 1 changesets
 
       
   180   $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
 
   177   $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
 
   181   obsoleted 1 changesets
 
       
   182   $ hg log -G --hidden
 
   178   $ hg log -G --hidden
 
   183   @  f6298a8ac3a4 (draft): B1
 
   179   @  f6298a8ac3a4 (draft): B1
 
   184   |
 
   180   |
 
   185   | o  e5ea8f9c7314 (draft): A1
 
   181   | o  e5ea8f9c7314 (draft): A1
 
   186   |/
 
   182   |/
 
   191   o  a9bdc8b26820 (public): O
 
   187   o  a9bdc8b26820 (public): O
 
   192   
   188   
   193   $ inspect_obsmarkers
 
   189   $ inspect_obsmarkers
 
   194   obsstore content
 
   190   obsstore content
 
   195   ================
 
   191   ================
 
   196   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   192   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
 
   197   6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   193   6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
 
   198   obshashtree
 
   194   obshashtree
 
   199   ===========
 
   195   ===========
 
   200   a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
 
   196   a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
 
   201   28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0000000000000000000000000000000000000000
 
   197   28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0000000000000000000000000000000000000000
 
   202   6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0000000000000000000000000000000000000000
 
   198   6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0000000000000000000000000000000000000000
 
   232   $ dotest A.3.b A1 -f
 
   228   $ dotest A.3.b A1 -f
 
   233   ## Running testcase A.3.b
 
   229   ## Running testcase A.3.b
 
   234   # testing echange of "A1" (e5ea8f9c7314)
 
   230   # testing echange of "A1" (e5ea8f9c7314)
 
   235   ## initial state
 
   231   ## initial state
 
   236   # obstore: main
 
   232   # obstore: main
 
   237   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   233   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
 
   238   6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   234   6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
 
   239   # obstore: pushdest
 
   235   # obstore: pushdest
 
   240   # obstore: pulldest
 
   236   # obstore: pulldest
 
   241   ## pushing "A1" from main to pushdest
 
   237   ## pushing "A1" from main to pushdest
 
   242   pushing to pushdest
 
   238   pushing to pushdest
 
   243   searching for changes
 
   239   searching for changes
 
   244   remote: adding changesets
 
   240   remote: adding changesets
 
   245   remote: adding manifests
 
   241   remote: adding manifests
 
   246   remote: adding file changes
 
   242   remote: adding file changes
 
   247   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
 
   243   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
 
   248   remote: 1 new obsolescence markers
 
   244   remote: 1 new obsolescence markers
 
   249   remote: obsoleted 1 changesets
 
       
   250   ## post push state
 
   245   ## post push state
 
   251   # obstore: main
 
   246   # obstore: main
 
   252   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   247   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
 
   253   6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   248   6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
 
   254   # obstore: pushdest
 
   249   # obstore: pushdest
 
   255   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   250   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
 
   256   # obstore: pulldest
 
   251   # obstore: pulldest
 
   257   ## pulling "e5ea8f9c7314" from main into pulldest
 
   252   ## pulling "e5ea8f9c7314" from main into pulldest
 
   258   pulling from main
 
   253   pulling from main
 
   259   searching for changes
 
   254   searching for changes
 
   260   adding changesets
 
   255   adding changesets
 
   261   adding manifests
 
   256   adding manifests
 
   262   adding file changes
 
   257   adding file changes
 
   263   added 1 changesets with 1 changes to 1 files (+1 heads)
 
   258   added 1 changesets with 1 changes to 1 files (+1 heads)
 
   264   1 new obsolescence markers
 
   259   1 new obsolescence markers
 
   265   obsoleted 1 changesets
 
       
   266   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   260   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   267   1 new unstable changesets
 
   261   1 new unstable changesets
 
   268   ## post pull state
 
   262   ## post pull state
 
   269   # obstore: main
 
   263   # obstore: main
 
   270   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   264   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
 
   271   6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   265   6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
 
   272   # obstore: pushdest
 
   266   # obstore: pushdest
 
   273   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   267   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
 
   274   # obstore: pulldest
 
   268   # obstore: pulldest
 
   275   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   269   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
evolve