equal
deleted
inserted
replaced
86 o a9bdc8b26820 (public): O |
86 o a9bdc8b26820 (public): O |
87 |
87 |
88 $ inspect_obsmarkers |
88 $ inspect_obsmarkers |
89 obsstore content |
89 obsstore content |
90 ================ |
90 ================ |
91 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
91 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob) |
92 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
92 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob) |
93 obshashtree |
93 obshashtree |
94 =========== |
94 =========== |
95 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000 |
95 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000 |
96 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0000000000000000000000000000000000000000 |
96 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0000000000000000000000000000000000000000 |
97 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0000000000000000000000000000000000000000 |
97 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0000000000000000000000000000000000000000 |
114 $ dotest A.3.a A1 |
114 $ dotest A.3.a A1 |
115 ## Running testcase A.3.a |
115 ## Running testcase A.3.a |
116 # testing echange of "A1" (e5ea8f9c7314) |
116 # testing echange of "A1" (e5ea8f9c7314) |
117 ## initial state |
117 ## initial state |
118 # obstore: main |
118 # obstore: main |
119 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
119 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob) |
120 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
120 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob) |
121 # obstore: pushdest |
121 # obstore: pushdest |
122 # obstore: pulldest |
122 # obstore: pulldest |
123 ## pushing "A1" from main to pushdest |
123 ## pushing "A1" from main to pushdest |
124 pushing to pushdest |
124 pushing to pushdest |
125 searching for changes |
125 searching for changes |
128 remote: adding file changes |
128 remote: adding file changes |
129 remote: added 1 changesets with 1 changes to 1 files |
129 remote: added 1 changesets with 1 changes to 1 files |
130 remote: 1 new obsolescence markers |
130 remote: 1 new obsolescence markers |
131 ## post push state |
131 ## post push state |
132 # obstore: main |
132 # obstore: main |
133 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
133 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob) |
134 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
134 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob) |
135 # obstore: pushdest |
135 # obstore: pushdest |
136 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
136 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob) |
137 # obstore: pulldest |
137 # obstore: pulldest |
138 ## pulling "e5ea8f9c7314" from main into pulldest |
138 ## pulling "e5ea8f9c7314" from main into pulldest |
139 pulling from main |
139 pulling from main |
140 searching for changes |
140 searching for changes |
141 adding changesets |
141 adding changesets |
144 added 1 changesets with 1 changes to 1 files |
144 added 1 changesets with 1 changes to 1 files |
145 1 new obsolescence markers |
145 1 new obsolescence markers |
146 (run 'hg update' to get a working copy) |
146 (run 'hg update' to get a working copy) |
147 ## post pull state |
147 ## post pull state |
148 # obstore: main |
148 # obstore: main |
149 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
149 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob) |
150 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
150 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob) |
151 # obstore: pushdest |
151 # obstore: pushdest |
152 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
152 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob) |
153 # obstore: pulldest |
153 # obstore: pulldest |
154 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
154 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob) |
155 |
155 |
156 other variant: changeset known in remote |
156 other variant: changeset known in remote |
157 ---------------------------------------- |
157 ---------------------------------------- |
158 |
158 |
159 $ setuprepos A.3.b |
159 $ setuprepos A.3.b |
187 o a9bdc8b26820 (public): O |
187 o a9bdc8b26820 (public): O |
188 |
188 |
189 $ inspect_obsmarkers |
189 $ inspect_obsmarkers |
190 obsstore content |
190 obsstore content |
191 ================ |
191 ================ |
192 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
192 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob) |
193 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
193 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob) |
194 obshashtree |
194 obshashtree |
195 =========== |
195 =========== |
196 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000 |
196 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000 |
197 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0000000000000000000000000000000000000000 |
197 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0000000000000000000000000000000000000000 |
198 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0000000000000000000000000000000000000000 |
198 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0000000000000000000000000000000000000000 |
228 $ dotest A.3.b A1 -f |
228 $ dotest A.3.b A1 -f |
229 ## Running testcase A.3.b |
229 ## Running testcase A.3.b |
230 # testing echange of "A1" (e5ea8f9c7314) |
230 # testing echange of "A1" (e5ea8f9c7314) |
231 ## initial state |
231 ## initial state |
232 # obstore: main |
232 # obstore: main |
233 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
233 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob) |
234 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
234 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob) |
235 # obstore: pushdest |
235 # obstore: pushdest |
236 # obstore: pulldest |
236 # obstore: pulldest |
237 ## pushing "A1" from main to pushdest |
237 ## pushing "A1" from main to pushdest |
238 pushing to pushdest |
238 pushing to pushdest |
239 searching for changes |
239 searching for changes |
242 remote: adding file changes |
242 remote: adding file changes |
243 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) |
244 remote: 1 new obsolescence markers |
244 remote: 1 new obsolescence markers |
245 ## post push state |
245 ## post push state |
246 # obstore: main |
246 # obstore: main |
247 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
247 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob) |
248 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
248 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob) |
249 # obstore: pushdest |
249 # obstore: pushdest |
250 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
250 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob) |
251 # obstore: pulldest |
251 # obstore: pulldest |
252 ## pulling "e5ea8f9c7314" from main into pulldest |
252 ## pulling "e5ea8f9c7314" from main into pulldest |
253 pulling from main |
253 pulling from main |
254 searching for changes |
254 searching for changes |
255 adding changesets |
255 adding changesets |
259 1 new obsolescence markers |
259 1 new obsolescence markers |
260 (run 'hg heads' to see heads, 'hg merge' to merge) |
260 (run 'hg heads' to see heads, 'hg merge' to merge) |
261 1 new unstable changesets |
261 1 new unstable changesets |
262 ## post pull state |
262 ## post pull state |
263 # obstore: main |
263 # obstore: main |
264 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
264 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob) |
265 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
265 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob) |
266 # obstore: pushdest |
266 # obstore: pushdest |
267 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
267 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob) |
268 # obstore: pulldest |
268 # obstore: pulldest |
269 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
269 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob) |