equal
deleted
inserted
replaced
70 $ cd .. |
70 $ cd .. |
71 |
71 |
72 $ cp -r B.5 B.5.a |
72 $ cp -r B.5 B.5.a |
73 $ cp -r B.5 B.5.b |
73 $ cp -r B.5 B.5.b |
74 |
74 |
75 Actual Test (explicite push version) |
75 Actual Test (explicit push version) |
76 ------------------------------------- |
76 ----------------------------------- |
77 |
77 |
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 |
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 markers (150 bytes) |
96 OBSEXC: pushing 2 obsolescence markers (150 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': '', 'user': 'test'} |
101 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} |
101 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} |
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 (150 bytes) |
115 OBSEXC: 2 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 |
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 markers (150 bytes) |
151 OBSEXC: pushing 2 obsolescence markers (150 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': '', 'user': 'test'} |
156 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} |
156 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} |
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 (150 bytes) |
170 OBSEXC: 2 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 |