equal
deleted
inserted
replaced
42 @ f5bc6836db60 (draft): A |
42 @ f5bc6836db60 (draft): A |
43 | |
43 | |
44 o a9bdc8b26820 (public): O |
44 o a9bdc8b26820 (public): O |
45 |
45 |
46 $ hg debugobsolete |
46 $ hg debugobsolete |
47 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'user': 'test'} |
47 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
48 $ cd .. |
48 $ cd .. |
49 $ cd .. |
49 $ cd .. |
50 |
50 |
51 setup both variants |
51 setup both variants |
52 |
52 |
60 $ dotest A.1.1.a A |
60 $ dotest A.1.1.a A |
61 ## Running testcase A.1.1.a |
61 ## Running testcase A.1.1.a |
62 # testing echange of "A" (f5bc6836db60) |
62 # testing echange of "A" (f5bc6836db60) |
63 ## initial state |
63 ## initial state |
64 # obstore: main |
64 # obstore: main |
65 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'user': 'test'} |
65 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
66 # obstore: pushdest |
66 # obstore: pushdest |
67 # obstore: pulldest |
67 # obstore: pulldest |
68 ## pushing "A" from main to pushdest |
68 ## pushing "A" from main to pushdest |
69 pushing to pushdest |
69 pushing to pushdest |
70 searching for changes |
70 searching for changes |
76 OBSEXC: computing markers relevant to 2 nodes |
76 OBSEXC: computing markers relevant to 2 nodes |
77 OBSEXC: pushing 1 obsolescence markers (65 bytes) |
77 OBSEXC: pushing 1 obsolescence markers (65 bytes) |
78 OBSEXC: DONE |
78 OBSEXC: DONE |
79 ## post push state |
79 ## post push state |
80 # obstore: main |
80 # obstore: main |
81 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'user': 'test'} |
81 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
82 # obstore: pushdest |
82 # obstore: pushdest |
83 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'user': 'test'} |
83 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
84 # obstore: pulldest |
84 # obstore: pulldest |
85 ## pulling "f5bc6836db60" from main into pulldest |
85 ## pulling "f5bc6836db60" from main into pulldest |
86 pulling from main |
86 pulling from main |
87 searching for changes |
87 searching for changes |
88 adding changesets |
88 adding changesets |
94 OBSEXC: 1 obsolescence markers added |
94 OBSEXC: 1 obsolescence markers added |
95 OBSEXC: DONE |
95 OBSEXC: DONE |
96 (run 'hg update' to get a working copy) |
96 (run 'hg update' to get a working copy) |
97 ## post pull state |
97 ## post pull state |
98 # obstore: main |
98 # obstore: main |
99 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'user': 'test'} |
99 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
100 # obstore: pushdest |
100 # obstore: pushdest |
101 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'user': 'test'} |
101 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
102 # obstore: pulldest |
102 # obstore: pulldest |
103 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'user': 'test'} |
103 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
104 |
104 |
105 |
105 |
106 |
106 |
107 |
107 |
108 Variant b: push |
108 Variant b: push |
110 |
110 |
111 $ dotest A.1.1.b |
111 $ dotest A.1.1.b |
112 ## Running testcase A.1.1.b |
112 ## Running testcase A.1.1.b |
113 ## initial state |
113 ## initial state |
114 # obstore: main |
114 # obstore: main |
115 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'user': 'test'} |
115 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
116 # obstore: pushdest |
116 # obstore: pushdest |
117 # obstore: pulldest |
117 # obstore: pulldest |
118 ## pushing from main to pushdest |
118 ## pushing from main to pushdest |
119 pushing to pushdest |
119 pushing to pushdest |
120 searching for changes |
120 searching for changes |
126 OBSEXC: computing markers relevant to 2 nodes |
126 OBSEXC: computing markers relevant to 2 nodes |
127 OBSEXC: pushing 1 obsolescence markers (65 bytes) |
127 OBSEXC: pushing 1 obsolescence markers (65 bytes) |
128 OBSEXC: DONE |
128 OBSEXC: DONE |
129 ## post push state |
129 ## post push state |
130 # obstore: main |
130 # obstore: main |
131 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'user': 'test'} |
131 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
132 # obstore: pushdest |
132 # obstore: pushdest |
133 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'user': 'test'} |
133 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
134 # obstore: pulldest |
134 # obstore: pulldest |
135 ## pulling from main into pulldest |
135 ## pulling from main into pulldest |
136 pulling from main |
136 pulling from main |
137 searching for changes |
137 searching for changes |
138 adding changesets |
138 adding changesets |
144 OBSEXC: 1 obsolescence markers added |
144 OBSEXC: 1 obsolescence markers added |
145 OBSEXC: DONE |
145 OBSEXC: DONE |
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 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'user': 'test'} |
149 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
150 # obstore: pushdest |
150 # obstore: pushdest |
151 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'user': 'test'} |
151 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
152 # obstore: pulldest |
152 # obstore: pulldest |
153 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'user': 'test'} |
153 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
154 |
154 |
155 |
155 |
156 |
156 |
157 |
157 |
158 |
158 |
201 | |
201 | |
202 o a9bdc8b26820 (public): O |
202 o a9bdc8b26820 (public): O |
203 |
203 |
204 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'` |
204 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'` |
205 $ hg debugobsolete |
205 $ hg debugobsolete |
206 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'user': 'test'} |
206 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
207 $ cd .. |
207 $ cd .. |
208 $ cd .. |
208 $ cd .. |
209 |
209 |
210 setup both variants |
210 setup both variants |
211 |
211 |
219 $ dotest A.1.2.a B |
219 $ dotest A.1.2.a B |
220 ## Running testcase A.1.2.a |
220 ## Running testcase A.1.2.a |
221 # testing echange of "B" (f6fbb35d8ac9) |
221 # testing echange of "B" (f6fbb35d8ac9) |
222 ## initial state |
222 ## initial state |
223 # obstore: main |
223 # obstore: main |
224 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'user': 'test'} |
224 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
225 # obstore: pushdest |
225 # obstore: pushdest |
226 # obstore: pulldest |
226 # obstore: pulldest |
227 ## pushing "B" from main to pushdest |
227 ## pushing "B" from main to pushdest |
228 pushing to pushdest |
228 pushing to pushdest |
229 searching for changes |
229 searching for changes |
235 OBSEXC: computing markers relevant to 3 nodes |
235 OBSEXC: computing markers relevant to 3 nodes |
236 OBSEXC: pushing 1 obsolescence markers (65 bytes) |
236 OBSEXC: pushing 1 obsolescence markers (65 bytes) |
237 OBSEXC: DONE |
237 OBSEXC: DONE |
238 ## post push state |
238 ## post push state |
239 # obstore: main |
239 # obstore: main |
240 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'user': 'test'} |
240 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
241 # obstore: pushdest |
241 # obstore: pushdest |
242 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'user': 'test'} |
242 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
243 # obstore: pulldest |
243 # obstore: pulldest |
244 ## pulling "f6fbb35d8ac9" from main into pulldest |
244 ## pulling "f6fbb35d8ac9" from main into pulldest |
245 pulling from main |
245 pulling from main |
246 searching for changes |
246 searching for changes |
247 adding changesets |
247 adding changesets |
253 OBSEXC: 1 obsolescence markers added |
253 OBSEXC: 1 obsolescence markers added |
254 OBSEXC: DONE |
254 OBSEXC: DONE |
255 (run 'hg update' to get a working copy) |
255 (run 'hg update' to get a working copy) |
256 ## post pull state |
256 ## post pull state |
257 # obstore: main |
257 # obstore: main |
258 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'user': 'test'} |
258 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
259 # obstore: pushdest |
259 # obstore: pushdest |
260 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'user': 'test'} |
260 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
261 # obstore: pulldest |
261 # obstore: pulldest |
262 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'user': 'test'} |
262 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
263 |
263 |
264 Variant b: push |
264 Variant b: push |
265 --------------- |
265 --------------- |
266 |
266 |
267 $ dotest A.1.2.b |
267 $ dotest A.1.2.b |
268 ## Running testcase A.1.2.b |
268 ## Running testcase A.1.2.b |
269 ## initial state |
269 ## initial state |
270 # obstore: main |
270 # obstore: main |
271 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'user': 'test'} |
271 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
272 # obstore: pushdest |
272 # obstore: pushdest |
273 # obstore: pulldest |
273 # obstore: pulldest |
274 ## pushing from main to pushdest |
274 ## pushing from main to pushdest |
275 pushing to pushdest |
275 pushing to pushdest |
276 searching for changes |
276 searching for changes |
282 OBSEXC: computing markers relevant to 3 nodes |
282 OBSEXC: computing markers relevant to 3 nodes |
283 OBSEXC: pushing 1 obsolescence markers (65 bytes) |
283 OBSEXC: pushing 1 obsolescence markers (65 bytes) |
284 OBSEXC: DONE |
284 OBSEXC: DONE |
285 ## post push state |
285 ## post push state |
286 # obstore: main |
286 # obstore: main |
287 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'user': 'test'} |
287 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
288 # obstore: pushdest |
288 # obstore: pushdest |
289 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'user': 'test'} |
289 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
290 # obstore: pulldest |
290 # obstore: pulldest |
291 ## pulling from main into pulldest |
291 ## pulling from main into pulldest |
292 pulling from main |
292 pulling from main |
293 searching for changes |
293 searching for changes |
294 adding changesets |
294 adding changesets |
300 OBSEXC: 1 obsolescence markers added |
300 OBSEXC: 1 obsolescence markers added |
301 OBSEXC: DONE |
301 OBSEXC: DONE |
302 (run 'hg update' to get a working copy) |
302 (run 'hg update' to get a working copy) |
303 ## post pull state |
303 ## post pull state |
304 # obstore: main |
304 # obstore: main |
305 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'user': 'test'} |
305 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
306 # obstore: pushdest |
306 # obstore: pushdest |
307 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'user': 'test'} |
307 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
308 # obstore: pulldest |
308 # obstore: pulldest |
309 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'user': 'test'} |
309 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |