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-C1.t
changeset 1065 f355bbc124fc
parent 1040 640f3280559e
child 1067 5d063fed9e3d
equal deleted inserted replaced
1064:95d84c8b4bcc 1065:f355bbc124fc 
    44   x  f5bc6836db60 (draft): A
 
    44   x  f5bc6836db60 (draft): A
 
    45   |
 
    45   |
 
    46   @  a9bdc8b26820 (public): O
 
    46   @  a9bdc8b26820 (public): O
 
    47   
    47   
    48   $ hg debugobsolete
 
    48   $ hg debugobsolete
 
    49   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
    49   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
    50   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
 
    50   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
 
    51   $ cd ..
 
    51   $ cd ..
 
    52   $ cd ..
 
    52   $ cd ..
 
    53 
    53 
    54   $ cp -r C.1 C.1.a
 
    54   $ cp -r C.1 C.1.a
 
    55   $ cp -r C.1 C.1.b
 
    55   $ cp -r C.1 C.1.b
 
    60   $ dotest C.1.a O
 
    60   $ dotest C.1.a O
 
    61   ## Running testcase C.1.a
 
    61   ## Running testcase C.1.a
 
    62   # testing echange of "O" (a9bdc8b26820)
 
    62   # testing echange of "O" (a9bdc8b26820)
 
    63   ## initial state
 
    63   ## initial state
 
    64   # obstore: main
 
    64   # obstore: main
 
    65   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
    65   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
    66   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
 
    66   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
 
    67   # obstore: pushdest
 
    67   # obstore: pushdest
 
    68   # obstore: pulldest
 
    68   # obstore: pulldest
 
    69   ## pushing "O" from main to pushdest
 
    69   ## pushing "O" from main to pushdest
 
    70   pushing to pushdest
 
    70   pushing to pushdest
 
    71   searching for changes
 
    71   searching for changes
 
    74   OBSEXC: computing markers relevant to 1 nodes
 
    74   OBSEXC: computing markers relevant to 1 nodes
 
    75   OBSEXC: pushing 2 obsolescence markers (177 bytes)
 
    75   OBSEXC: pushing 2 obsolescence markers (177 bytes)
 
    76   OBSEXC: DONE
 
    76   OBSEXC: DONE
 
    77   ## post push state
 
    77   ## post push state
 
    78   # obstore: main
 
    78   # obstore: main
 
    79   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
    79   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
    80   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
 
    80   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
 
    81   # obstore: pushdest
 
    81   # obstore: pushdest
 
    82   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
    82   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
    83   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
 
    83   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
 
    84   # obstore: pulldest
 
    84   # obstore: pulldest
 
    85   ## pulling "a9bdc8b26820" from main into pulldest
 
    85   ## pulling "a9bdc8b26820" from main into pulldest
 
    86   pulling from main
 
    86   pulling from main
 
    87   no changes found
 
    87   no changes found
 
    88   OBSEXC: pull obsolescence markers
 
    88   OBSEXC: pull obsolescence markers
 
    89   OBSEXC: merging obsolescence markers (177 bytes)
 
    89   OBSEXC: merging obsolescence markers (177 bytes)
 
    90   OBSEXC: 2 obsolescence markers added
 
    90   OBSEXC: 2 obsolescence markers added
 
    91   OBSEXC: DONE
 
    91   OBSEXC: DONE
 
    92   ## post pull state
 
    92   ## post pull state
 
    93   # obstore: main
 
    93   # obstore: main
 
    94   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
    94   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
    95   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
 
    95   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
 
    96   # obstore: pushdest
 
    96   # obstore: pushdest
 
    97   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
    97   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
    98   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
 
    98   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
 
    99   # obstore: pulldest
 
    99   # obstore: pulldest
 
   100   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   100   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   101   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
 
   101   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
 
   102 
   102 
   103 Actual Test (bare push)
 
   103 Actual Test (bare push)
 
   104 -------------------------------------
 
   104 -------------------------------------
 
   105 
   105 
   106   $ dotest C.1.b
 
   106   $ dotest C.1.b
 
   107   ## Running testcase C.1.b
 
   107   ## Running testcase C.1.b
 
   108   ## initial state
 
   108   ## initial state
 
   109   # obstore: main
 
   109   # obstore: main
 
   110   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   110   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   111   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
 
   111   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
 
   112   # obstore: pushdest
 
   112   # obstore: pushdest
 
   113   # obstore: pulldest
 
   113   # obstore: pulldest
 
   114   ## pushing from main to pushdest
 
   114   ## pushing from main to pushdest
 
   115   pushing to pushdest
 
   115   pushing to pushdest
 
   116   searching for changes
 
   116   searching for changes
 
   119   OBSEXC: computing markers relevant to 1 nodes
 
   119   OBSEXC: computing markers relevant to 1 nodes
 
   120   OBSEXC: pushing 2 obsolescence markers (177 bytes)
 
   120   OBSEXC: pushing 2 obsolescence markers (177 bytes)
 
   121   OBSEXC: DONE
 
   121   OBSEXC: DONE
 
   122   ## post push state
 
   122   ## post push state
 
   123   # obstore: main
 
   123   # obstore: main
 
   124   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   124   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   125   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
 
   125   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
 
   126   # obstore: pushdest
 
   126   # obstore: pushdest
 
   127   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   127   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   128   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
 
   128   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
 
   129   # obstore: pulldest
 
   129   # obstore: pulldest
 
   130   ## pulling from main into pulldest
 
   130   ## pulling from main into pulldest
 
   131   pulling from main
 
   131   pulling from main
 
   132   searching for changes
 
   132   searching for changes
 
   133   no changes found
 
   133   no changes found
 
   135   OBSEXC: merging obsolescence markers (177 bytes)
 
   135   OBSEXC: merging obsolescence markers (177 bytes)
 
   136   OBSEXC: 2 obsolescence markers added
 
   136   OBSEXC: 2 obsolescence markers added
 
   137   OBSEXC: DONE
 
   137   OBSEXC: DONE
 
   138   ## post pull state
 
   138   ## post pull state
 
   139   # obstore: main
 
   139   # obstore: main
 
   140   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   140   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   141   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
 
   141   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
 
   142   # obstore: pushdest
 
   142   # obstore: pushdest
 
   143   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   143   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   144   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
 
   144   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
 
   145   # obstore: pulldest
 
   145   # obstore: pulldest
 
   146   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   146   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
 
   147   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
 
   147   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
evolve