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-B5.t
branchstable
changeset 1060 f6e0cfca1bf0
parent 1040 640f3280559e
child 1065 f355bbc124fc
equal deleted inserted replaced
1057:168dfc839eca 1060:f6e0cfca1bf0 
    62   | x  28b51eb45704 (draft): A0
 
    62   | x  28b51eb45704 (draft): A0
 
    63   |/
 
    63   |/
 
    64   @  a9bdc8b26820 (public): O
 
    64   @  a9bdc8b26820 (public): O
 
    65   
    65   
    66   $ hg debugobsolete
 
    66   $ hg debugobsolete
 
    67   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
 
    67   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'user': 'test'}
 
    68   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
    68   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
    69   $ cd ..
 
    69   $ cd ..
 
    70   $ cd ..
 
    70   $ cd ..
 
    71 
    71 
    72   $ cp -r B.5 B.5.a
 
    72   $ cp -r B.5 B.5.a
 
    78   $ dotest B.5.a B -f
 
    78   $ dotest B.5.a B -f
 
    79   ## Running testcase B.5.a
 
    79   ## Running testcase B.5.a
 
    80   # testing echange of "B" (06055a7959d4)
 
    80   # testing echange of "B" (06055a7959d4)
 
    81   ## initial state
 
    81   ## initial state
 
    82   # obstore: main
 
    82   # obstore: main
 
    83   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
 
    83   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'user': 'test'}
 
    84   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
    84   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
    85   # obstore: pushdest
 
    85   # obstore: pushdest
 
    86   # obstore: pulldest
 
    86   # obstore: pulldest
 
    87   ## pushing "B" from main to pushdest
 
    87   ## pushing "B" from main to pushdest
 
    88   pushing to pushdest
 
    88   pushing to pushdest
 
    91   adding manifests
 
    91   adding manifests
 
    92   adding file changes
 
    92   adding file changes
 
    93   added 2 changesets with 2 changes to 2 files
 
    93   added 2 changesets with 2 changes to 2 files
 
    94   OBSEXC: computing relevant nodes
 
    94   OBSEXC: computing relevant nodes
 
    95   OBSEXC: computing markers relevant to 3 nodes
 
    95   OBSEXC: computing markers relevant to 3 nodes
 
    96   OBSEXC: pushing 2 obsolescence markers (150 bytes)
 
    96   OBSEXC: pushing 2 obsolescence markers (153 bytes)
 
    97   OBSEXC: DONE
 
    97   OBSEXC: DONE
 
    98   ## post push state
 
    98   ## post push state
 
    99   # obstore: main
 
    99   # obstore: main
 
   100   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
 
   100   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'user': 'test'}
 
   101   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   101   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   102   # obstore: pushdest
 
   102   # obstore: pushdest
 
   103   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
 
   103   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'user': 'test'}
 
   104   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   104   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   105   # obstore: pulldest
 
   105   # obstore: pulldest
 
   106   ## pulling "06055a7959d4" from main into pulldest
 
   106   ## pulling "06055a7959d4" from main into pulldest
 
   107   pulling from main
 
   107   pulling from main
 
   108   searching for changes
 
   108   searching for changes
 
   109   adding changesets
 
   109   adding changesets
 
   110   adding manifests
 
   110   adding manifests
 
   111   adding file changes
 
   111   adding file changes
 
   112   added 2 changesets with 2 changes to 2 files
 
   112   added 2 changesets with 2 changes to 2 files
 
   113   OBSEXC: pull obsolescence markers
 
   113   OBSEXC: pull obsolescence markers
 
   114   OBSEXC: merging obsolescence markers (150 bytes)
 
   114   OBSEXC: merging obsolescence markers (153 bytes)
 
   115   OBSEXC: 2 obsolescence markers added
 
   115   OBSEXC: 2 obsolescence markers added
 
   116   OBSEXC: DONE
 
   116   OBSEXC: DONE
 
   117   (run 'hg update' to get a working copy)
 
   117   (run 'hg update' to get a working copy)
 
   118   1 new unstable changesets
 
   118   1 new unstable changesets
 
   119   ## post pull state
 
   119   ## post pull state
 
   120   # obstore: main
 
   120   # obstore: main
 
   121   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
 
   121   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'user': 'test'}
 
   122   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   122   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   123   # obstore: pushdest
 
   123   # obstore: pushdest
 
   124   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
 
   124   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'user': 'test'}
 
   125   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   125   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   126   # obstore: pulldest
 
   126   # obstore: pulldest
 
   127   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
 
   127   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'user': 'test'}
 
   128   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   128   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   129 
   129 
   130 Actual Test (bare push version)
 
   130 Actual Test (bare push version)
 
   131 -------------------------------------
 
   131 -------------------------------------
 
   132 
   132 
   133   $ dotest B.5.b B -f
 
   133   $ dotest B.5.b B -f
 
   134   ## Running testcase B.5.b
 
   134   ## Running testcase B.5.b
 
   135   # testing echange of "B" (06055a7959d4)
 
   135   # testing echange of "B" (06055a7959d4)
 
   136   ## initial state
 
   136   ## initial state
 
   137   # obstore: main
 
   137   # obstore: main
 
   138   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
 
   138   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'user': 'test'}
 
   139   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   139   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   140   # obstore: pushdest
 
   140   # obstore: pushdest
 
   141   # obstore: pulldest
 
   141   # obstore: pulldest
 
   142   ## pushing "B" from main to pushdest
 
   142   ## pushing "B" from main to pushdest
 
   143   pushing to pushdest
 
   143   pushing to pushdest
 
   146   adding manifests
 
   146   adding manifests
 
   147   adding file changes
 
   147   adding file changes
 
   148   added 2 changesets with 2 changes to 2 files
 
   148   added 2 changesets with 2 changes to 2 files
 
   149   OBSEXC: computing relevant nodes
 
   149   OBSEXC: computing relevant nodes
 
   150   OBSEXC: computing markers relevant to 3 nodes
 
   150   OBSEXC: computing markers relevant to 3 nodes
 
   151   OBSEXC: pushing 2 obsolescence markers (150 bytes)
 
   151   OBSEXC: pushing 2 obsolescence markers (153 bytes)
 
   152   OBSEXC: DONE
 
   152   OBSEXC: DONE
 
   153   ## post push state
 
   153   ## post push state
 
   154   # obstore: main
 
   154   # obstore: main
 
   155   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
 
   155   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'user': 'test'}
 
   156   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   156   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   157   # obstore: pushdest
 
   157   # obstore: pushdest
 
   158   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
 
   158   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'user': 'test'}
 
   159   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   159   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   160   # obstore: pulldest
 
   160   # obstore: pulldest
 
   161   ## pulling "06055a7959d4" from main into pulldest
 
   161   ## pulling "06055a7959d4" from main into pulldest
 
   162   pulling from main
 
   162   pulling from main
 
   163   searching for changes
 
   163   searching for changes
 
   164   adding changesets
 
   164   adding changesets
 
   165   adding manifests
 
   165   adding manifests
 
   166   adding file changes
 
   166   adding file changes
 
   167   added 2 changesets with 2 changes to 2 files
 
   167   added 2 changesets with 2 changes to 2 files
 
   168   OBSEXC: pull obsolescence markers
 
   168   OBSEXC: pull obsolescence markers
 
   169   OBSEXC: merging obsolescence markers (150 bytes)
 
   169   OBSEXC: merging obsolescence markers (153 bytes)
 
   170   OBSEXC: 2 obsolescence markers added
 
   170   OBSEXC: 2 obsolescence markers added
 
   171   OBSEXC: DONE
 
   171   OBSEXC: DONE
 
   172   (run 'hg update' to get a working copy)
 
   172   (run 'hg update' to get a working copy)
 
   173   1 new unstable changesets
 
   173   1 new unstable changesets
 
   174   ## post pull state
 
   174   ## post pull state
 
   175   # obstore: main
 
   175   # obstore: main
 
   176   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
 
   176   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'user': 'test'}
 
   177   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   177   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   178   # obstore: pushdest
 
   178   # obstore: pushdest
 
   179   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
 
   179   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'user': 'test'}
 
   180   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   180   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   181   # obstore: pulldest
 
   181   # obstore: pulldest
 
   182   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
 
   182   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'user': 'test'}
 
   183   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   183   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
evolve