equal
deleted
inserted
replaced
72 |
72 |
73 |
73 |
74 $ cp -r B.4 B.4.a |
74 $ cp -r B.4 B.4.a |
75 $ cp -r B.4 B.4.b |
75 $ cp -r B.4 B.4.b |
76 |
76 |
77 Actual Test (explicite push version) |
77 Actual Test (explicit push version) |
78 ----------------------------------- |
78 ----------------------------------- |
79 |
79 |
80 $ dotest B.4.a O |
80 $ dotest B.4.a O |
81 ## Running testcase B.4.a |
81 ## Running testcase B.4.a |
82 # testing echange of "O" (a9bdc8b26820) |
82 # testing echange of "O" (a9bdc8b26820) |
89 pushing to pushdest |
89 pushing to pushdest |
90 searching for changes |
90 searching for changes |
91 no changes found |
91 no changes found |
92 OBSEXC: computing relevant nodes |
92 OBSEXC: computing relevant nodes |
93 OBSEXC: computing markers relevant to 1 nodes |
93 OBSEXC: computing markers relevant to 1 nodes |
94 OBSEXC: pushing 1 markers (89 bytes) |
94 OBSEXC: pushing 1 obsolescence markers (89 bytes) |
95 OBSEXC: DONE |
95 OBSEXC: DONE |
96 ## post push state |
96 ## post push state |
97 # obstore: main |
97 # obstore: main |
98 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} |
98 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} |
99 # obstore: pushdest |
99 # obstore: pushdest |
102 ## pulling "a9bdc8b26820" from main into pulldest |
102 ## pulling "a9bdc8b26820" from main into pulldest |
103 pulling from main |
103 pulling from main |
104 no changes found |
104 no changes found |
105 OBSEXC: pull obsolescence markers |
105 OBSEXC: pull obsolescence markers |
106 OBSEXC: merging obsolescence markers (89 bytes) |
106 OBSEXC: merging obsolescence markers (89 bytes) |
107 OBSEXC: 1 markers added |
107 OBSEXC: 1 obsolescence markers added |
108 OBSEXC: DONE |
108 OBSEXC: DONE |
109 ## post pull state |
109 ## post pull state |
110 # obstore: main |
110 # obstore: main |
111 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} |
111 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} |
112 # obstore: pushdest |
112 # obstore: pushdest |
128 pushing to pushdest |
128 pushing to pushdest |
129 searching for changes |
129 searching for changes |
130 no changes found |
130 no changes found |
131 OBSEXC: computing relevant nodes |
131 OBSEXC: computing relevant nodes |
132 OBSEXC: computing markers relevant to 3 nodes |
132 OBSEXC: computing markers relevant to 3 nodes |
133 OBSEXC: pushing 1 markers (89 bytes) |
133 OBSEXC: pushing 1 obsolescence markers (89 bytes) |
134 OBSEXC: DONE |
134 OBSEXC: DONE |
135 ## post push state |
135 ## post push state |
136 # obstore: main |
136 # obstore: main |
137 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} |
137 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} |
138 # obstore: pushdest |
138 # obstore: pushdest |
142 pulling from main |
142 pulling from main |
143 searching for changes |
143 searching for changes |
144 no changes found |
144 no changes found |
145 OBSEXC: pull obsolescence markers |
145 OBSEXC: pull obsolescence markers |
146 OBSEXC: merging obsolescence markers (89 bytes) |
146 OBSEXC: merging obsolescence markers (89 bytes) |
147 OBSEXC: 1 markers added |
147 OBSEXC: 1 obsolescence markers added |
148 OBSEXC: DONE |
148 OBSEXC: DONE |
149 ## post pull state |
149 ## post pull state |
150 # obstore: main |
150 # obstore: main |
151 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} |
151 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} |
152 # obstore: pushdest |
152 # obstore: pushdest |