Show More
| @@ -2,9 +2,6 b'' | |||
|
|
2 | 2 | Test obsmarkers interaction with bundle and strip |
|
|
3 | 3 | ================================================== |
|
|
4 | 4 | |
|
|
5 | The file currently only contains test for bundle. | |
|
|
6 | Testing of strip will happen some time soon (tm). | |
|
|
7 | ||
|
|
8 | 5 | Setup a repository with various case |
|
|
9 | 6 | ==================================== |
|
|
10 | 7 | |
| @@ -50,7 +47,7 b' Config setup' | |||
|
|
50 | 47 | > } |
|
|
51 | 48 | |
|
|
52 | 49 | Function to compare the expected bundled obsmarkers with the actually bundled |
|
|
53 | obsmarkers. | |
|
|
50 | obsmarkers. It also check the obsmarkers backed up during strip. | |
|
|
54 | 51 | |
|
|
55 | 52 | $ testrevs () { |
|
|
56 | 53 | > revs="$1" |
| @@ -60,6 +57,7 b' obsmarkers.' | |||
|
|
60 | 57 | > markersfile="${prefix}-relevant-markers.txt" |
|
|
61 | 58 | > bundlefile="${prefix}-bundle.hg" |
|
|
62 | 59 | > contentfile="${prefix}-bundle-markers.hg" |
|
|
60 | > stripcontentfile="${prefix}-bundle-markers.hg" | |
|
|
63 | 61 | > hg debugobsolete --hidden --rev "${revs}" | sed 's/^/ /' > "${markersfile}" |
|
|
64 | 62 | > echo '### Matched revisions###' |
|
|
65 | 63 | > hg log --hidden --rev "${revs}" | sort |
| @@ -73,6 +71,22 b' obsmarkers.' | |||
|
|
73 | 71 | > echo '### diff <relevant> <bundled> ###' |
|
|
74 | 72 | > cmp "${markersfile}" "${contentfile}" || diff -u "${markersfile}" "${contentfile}" |
|
|
75 | 73 | > echo '#################################' |
|
|
74 | > # if the matched revs do not have children, we also check the result of strip | |
|
|
75 | > orphan=`hg log --hidden -T '.\n' --rev "(not ${revs}) and (${revs}::)" | wc -l | sed -e 's/ //g'` | |
|
|
76 | > if [ $orphan -eq 0 ]; | |
|
|
77 | > then | |
|
|
78 | > printf "# stripping: " | |
|
|
79 | > hg strip --hidden --rev "${revs}" | |
|
|
80 | > hg debugbundle .hg/strip-backup/* | grep "obsmarkers --" -A 100 | sed 1,2d > "${stripcontentfile}" | |
|
|
81 | > echo '### Backup markers ###' | |
|
|
82 | > cat "${stripcontentfile}" | |
|
|
83 | > echo '### diff <relevant> <backed-up> ###' | |
|
|
84 | > cmp "${markersfile}" "${stripcontentfile}" || diff -u "${markersfile}" "${stripcontentfile}" | |
|
|
85 | > echo '#################################' | |
|
|
86 | > hg unbundle .hg/strip-backup/* | sed 's/^/# unbundling: /' | |
|
|
87 | > # clean up directory for the next test | |
|
|
88 | > rm .hg/strip-backup/* | |
|
|
89 | > fi | |
|
|
76 | 90 | > } |
|
|
77 | 91 | |
|
|
78 | 92 | root setup |
| @@ -126,6 +140,16 b' Actual testing' | |||
|
|
126 | 140 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
127 | 141 | ### diff <relevant> <bundled> ### |
|
|
128 | 142 | ################################# |
|
|
143 | # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/84fcb0dfe17b-6454bbdc-backup.hg | |
|
|
144 | ### Backup markers ### | |
|
|
145 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
146 | ### diff <relevant> <backed-up> ### | |
|
|
147 | ################################# | |
|
|
148 | # unbundling: adding changesets | |
|
|
149 | # unbundling: adding manifests | |
|
|
150 | # unbundling: adding file changes | |
|
|
151 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
|
152 | # unbundling: (run 'hg heads' to see heads) | |
|
|
129 | 153 | |
|
|
130 | 154 | $ testrevs 'desc("C-A1")' |
|
|
131 | 155 | ### Matched revisions### |
| @@ -141,6 +165,18 b' Actual testing' | |||
|
|
141 | 165 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
142 | 166 | ### diff <relevant> <bundled> ### |
|
|
143 | 167 | ################################# |
|
|
168 | # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg | |
|
|
169 | ### Backup markers ### | |
|
|
170 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
171 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
172 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
173 | ### diff <relevant> <backed-up> ### | |
|
|
174 | ################################# | |
|
|
175 | # unbundling: adding changesets | |
|
|
176 | # unbundling: adding manifests | |
|
|
177 | # unbundling: adding file changes | |
|
|
178 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
|
179 | # unbundling: (run 'hg heads' to see heads) | |
|
|
144 | 180 | |
|
|
145 | 181 | $ testrevs 'desc("C-A")' |
|
|
146 | 182 | ### Matched revisions### |
| @@ -157,6 +193,18 b' Actual testing' | |||
|
|
157 | 193 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
158 | 194 | ### diff <relevant> <bundled> ### |
|
|
159 | 195 | ################################# |
|
|
196 | # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/cf2c22470d67-fce4fc64-backup.hg | |
|
|
197 | ### Backup markers ### | |
|
|
198 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
199 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
200 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
201 | ### diff <relevant> <backed-up> ### | |
|
|
202 | ################################# | |
|
|
203 | # unbundling: adding changesets | |
|
|
204 | # unbundling: adding manifests | |
|
|
205 | # unbundling: adding file changes | |
|
|
206 | # unbundling: added 2 changesets with 2 changes to 2 files (+1 heads) | |
|
|
207 | # unbundling: (run 'hg heads' to see heads) | |
|
|
160 | 208 | |
|
|
161 | 209 | chain with prune children |
|
|
162 | 210 | ========================= |
| @@ -222,6 +270,16 b' Actual testing' | |||
|
|
222 | 270 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
223 | 271 | ### diff <relevant> <bundled> ### |
|
|
224 | 272 | ################################# |
|
|
273 | # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/29f93b1df87b-7fb32101-backup.hg | |
|
|
274 | ### Backup markers ### | |
|
|
275 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
276 | ### diff <relevant> <backed-up> ### | |
|
|
277 | ################################# | |
|
|
278 | # unbundling: adding changesets | |
|
|
279 | # unbundling: adding manifests | |
|
|
280 | # unbundling: adding file changes | |
|
|
281 | # unbundling: added 1 changesets with 1 changes to 1 files | |
|
|
282 | # unbundling: (run 'hg update' to get a working copy) | |
|
|
225 | 283 | |
|
|
226 | 284 | $ testrevs 'desc("C-A1")' |
|
|
227 | 285 | ### Matched revisions### |
| @@ -237,6 +295,18 b' Actual testing' | |||
|
|
237 | 295 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
238 | 296 | ### diff <relevant> <bundled> ### |
|
|
239 | 297 | ################################# |
|
|
298 | # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg | |
|
|
299 | ### Backup markers ### | |
|
|
300 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
301 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
302 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
303 | ### diff <relevant> <backed-up> ### | |
|
|
304 | ################################# | |
|
|
305 | # unbundling: adding changesets | |
|
|
306 | # unbundling: adding manifests | |
|
|
307 | # unbundling: adding file changes | |
|
|
308 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
|
309 | # unbundling: (run 'hg heads' to see heads) | |
|
|
240 | 310 | |
|
|
241 | 311 | bundling multiple revisions |
|
|
242 | 312 | |
| @@ -272,6 +342,18 b' bundling multiple revisions' | |||
|
|
272 | 342 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
273 | 343 | ### diff <relevant> <bundled> ### |
|
|
274 | 344 | ################################# |
|
|
345 | # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/cf2c22470d67-884c33b0-backup.hg | |
|
|
346 | ### Backup markers ### | |
|
|
347 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
348 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
349 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
350 | ### diff <relevant> <backed-up> ### | |
|
|
351 | ################################# | |
|
|
352 | # unbundling: adding changesets | |
|
|
353 | # unbundling: adding manifests | |
|
|
354 | # unbundling: adding file changes | |
|
|
355 | # unbundling: added 3 changesets with 3 changes to 3 files (+1 heads) | |
|
|
356 | # unbundling: (run 'hg heads' to see heads) | |
|
|
275 | 357 | |
|
|
276 | 358 | chain with precursors also pruned |
|
|
277 | 359 | ================================= |
| @@ -322,6 +404,17 b' Actual testing' | |||
|
|
322 | 404 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
323 | 405 | ### diff <relevant> <bundled> ### |
|
|
324 | 406 | ################################# |
|
|
407 | # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/84fcb0dfe17b-6454bbdc-backup.hg | |
|
|
408 | ### Backup markers ### | |
|
|
409 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
410 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
411 | ### diff <relevant> <backed-up> ### | |
|
|
412 | ################################# | |
|
|
413 | # unbundling: adding changesets | |
|
|
414 | # unbundling: adding manifests | |
|
|
415 | # unbundling: adding file changes | |
|
|
416 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
|
417 | # unbundling: (run 'hg heads' to see heads) | |
|
|
325 | 418 | |
|
|
326 | 419 | $ testrevs 'desc("C-A1")' |
|
|
327 | 420 | ### Matched revisions### |
| @@ -337,6 +430,18 b' Actual testing' | |||
|
|
337 | 430 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
338 | 431 | ### diff <relevant> <bundled> ### |
|
|
339 | 432 | ################################# |
|
|
433 | # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg | |
|
|
434 | ### Backup markers ### | |
|
|
435 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
436 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
437 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
438 | ### diff <relevant> <backed-up> ### | |
|
|
439 | ################################# | |
|
|
440 | # unbundling: adding changesets | |
|
|
441 | # unbundling: adding manifests | |
|
|
442 | # unbundling: adding file changes | |
|
|
443 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
|
444 | # unbundling: (run 'hg heads' to see heads) | |
|
|
340 | 445 | |
|
|
341 | 446 | $ testrevs 'desc("C-A")' |
|
|
342 | 447 | ### Matched revisions### |
| @@ -353,6 +458,18 b' Actual testing' | |||
|
|
353 | 458 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
354 | 459 | ### diff <relevant> <bundled> ### |
|
|
355 | 460 | ################################# |
|
|
461 | # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/cf2c22470d67-fce4fc64-backup.hg | |
|
|
462 | ### Backup markers ### | |
|
|
463 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
464 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
465 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
466 | ### diff <relevant> <backed-up> ### | |
|
|
467 | ################################# | |
|
|
468 | # unbundling: adding changesets | |
|
|
469 | # unbundling: adding manifests | |
|
|
470 | # unbundling: adding file changes | |
|
|
471 | # unbundling: added 2 changesets with 2 changes to 2 files (+1 heads) | |
|
|
472 | # unbundling: (run 'hg heads' to see heads) | |
|
|
356 | 473 | |
|
|
357 | 474 | chain with missing prune |
|
|
358 | 475 | ======================== |
| @@ -410,6 +527,18 b' Actual testing' | |||
|
|
410 | 527 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
411 | 528 | ### diff <relevant> <bundled> ### |
|
|
412 | 529 | ################################# |
|
|
530 | # stripping: saved backup bundle to $TESTTMP/missing-prune/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg | |
|
|
531 | ### Backup markers ### | |
|
|
532 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
533 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
534 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
535 | ### diff <relevant> <backed-up> ### | |
|
|
536 | ################################# | |
|
|
537 | # unbundling: adding changesets | |
|
|
538 | # unbundling: adding manifests | |
|
|
539 | # unbundling: adding file changes | |
|
|
540 | # unbundling: added 1 changesets with 1 changes to 1 files | |
|
|
541 | # unbundling: (run 'hg update' to get a working copy) | |
|
|
413 | 542 | |
|
|
414 | 543 | chain with precursors also pruned |
|
|
415 | 544 | ================================= |
| @@ -465,6 +594,18 b' Actual testing' | |||
|
|
465 | 594 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
466 | 595 | ### diff <relevant> <bundled> ### |
|
|
467 | 596 | ################################# |
|
|
597 | # stripping: saved backup bundle to $TESTTMP/prune-inline-missing/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg | |
|
|
598 | ### Backup markers ### | |
|
|
599 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
600 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
601 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
602 | ### diff <relevant> <backed-up> ### | |
|
|
603 | ################################# | |
|
|
604 | # unbundling: adding changesets | |
|
|
605 | # unbundling: adding manifests | |
|
|
606 | # unbundling: adding file changes | |
|
|
607 | # unbundling: added 1 changesets with 1 changes to 1 files | |
|
|
608 | # unbundling: (run 'hg update' to get a working copy) | |
|
|
468 | 609 | |
|
|
469 | 610 | Chain with fold and split |
|
|
470 | 611 | ========================= |
| @@ -539,6 +680,16 b' Actual testing' | |||
|
|
539 | 680 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
540 | 681 | ### diff <relevant> <bundled> ### |
|
|
541 | 682 | ################################# |
|
|
683 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/9ac430e15fca-81204eba-backup.hg | |
|
|
684 | ### Backup markers ### | |
|
|
685 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
686 | ### diff <relevant> <backed-up> ### | |
|
|
687 | ################################# | |
|
|
688 | # unbundling: adding changesets | |
|
|
689 | # unbundling: adding manifests | |
|
|
690 | # unbundling: adding file changes | |
|
|
691 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
|
692 | # unbundling: (run 'hg heads' to see heads) | |
|
|
542 | 693 | |
|
|
543 | 694 | $ testrevs 'desc("C-B")' |
|
|
544 | 695 | ### Matched revisions### |
| @@ -552,6 +703,17 b' Actual testing' | |||
|
|
552 | 703 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
553 | 704 | ### diff <relevant> <bundled> ### |
|
|
554 | 705 | ################################# |
|
|
706 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/a9b9da38ed96-7465d6e9-backup.hg | |
|
|
707 | ### Backup markers ### | |
|
|
708 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
709 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
710 | ### diff <relevant> <backed-up> ### | |
|
|
711 | ################################# | |
|
|
712 | # unbundling: adding changesets | |
|
|
713 | # unbundling: adding manifests | |
|
|
714 | # unbundling: adding file changes | |
|
|
715 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
|
716 | # unbundling: (run 'hg heads' to see heads) | |
|
|
555 | 717 | |
|
|
556 | 718 | $ testrevs 'desc("C-C")' |
|
|
557 | 719 | ### Matched revisions### |
| @@ -565,6 +727,17 b' Actual testing' | |||
|
|
565 | 727 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
566 | 728 | ### diff <relevant> <bundled> ### |
|
|
567 | 729 | ################################# |
|
|
730 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/27ec657ca21d-d5dd1c7c-backup.hg | |
|
|
731 | ### Backup markers ### | |
|
|
732 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
733 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
734 | ### diff <relevant> <backed-up> ### | |
|
|
735 | ################################# | |
|
|
736 | # unbundling: adding changesets | |
|
|
737 | # unbundling: adding manifests | |
|
|
738 | # unbundling: adding file changes | |
|
|
739 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
|
740 | # unbundling: (run 'hg heads' to see heads) | |
|
|
568 | 741 | |
|
|
569 | 742 | $ testrevs 'desc("C-D")' |
|
|
570 | 743 | ### Matched revisions### |
| @@ -578,6 +751,17 b' Actual testing' | |||
|
|
578 | 751 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
579 | 752 | ### diff <relevant> <bundled> ### |
|
|
580 | 753 | ################################# |
|
|
754 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/06dc9da25ef0-9b1c0a91-backup.hg | |
|
|
755 | ### Backup markers ### | |
|
|
756 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
757 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
758 | ### diff <relevant> <backed-up> ### | |
|
|
759 | ################################# | |
|
|
760 | # unbundling: adding changesets | |
|
|
761 | # unbundling: adding manifests | |
|
|
762 | # unbundling: adding file changes | |
|
|
763 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
|
764 | # unbundling: (run 'hg heads' to see heads) | |
|
|
581 | 765 | |
|
|
582 | 766 | $ testrevs 'desc("C-E")' |
|
|
583 | 767 | ### Matched revisions### |
| @@ -605,6 +789,24 b' Actual testing' | |||
|
|
605 | 789 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
606 | 790 | ### diff <relevant> <bundled> ### |
|
|
607 | 791 | ################################# |
|
|
792 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-8adeb22d-backup.hg | |
|
|
793 | ### Backup markers ### | |
|
|
794 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
795 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
796 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
797 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
798 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
799 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
800 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
801 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
802 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
803 | ### diff <relevant> <backed-up> ### | |
|
|
804 | ################################# | |
|
|
805 | # unbundling: adding changesets | |
|
|
806 | # unbundling: adding manifests | |
|
|
807 | # unbundling: adding file changes | |
|
|
808 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
|
809 | # unbundling: (run 'hg heads' to see heads) | |
|
|
608 | 810 | |
|
|
609 | 811 | Bundle multiple revisions |
|
|
610 | 812 | |
| @@ -746,6 +948,24 b' Bundle multiple revisions' | |||
|
|
746 | 948 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
747 | 949 | ### diff <relevant> <bundled> ### |
|
|
748 | 950 | ################################# |
|
|
951 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/a9b9da38ed96-eeb4258f-backup.hg | |
|
|
952 | ### Backup markers ### | |
|
|
953 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
954 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
955 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
956 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
957 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
958 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
959 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
960 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
961 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
962 | ### diff <relevant> <backed-up> ### | |
|
|
963 | ################################# | |
|
|
964 | # unbundling: adding changesets | |
|
|
965 | # unbundling: adding manifests | |
|
|
966 | # unbundling: adding file changes | |
|
|
967 | # unbundling: added 5 changesets with 5 changes to 5 files (+4 heads) | |
|
|
968 | # unbundling: (run 'hg heads' to see heads) | |
|
|
749 | 969 | |
|
|
750 | 970 | changeset pruned on its own |
|
|
751 | 971 | =========================== |
| @@ -800,3 +1020,13 b' Actual testing' | |||
|
|
800 | 1020 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
801 | 1021 | ### diff <relevant> <bundled> ### |
|
|
802 | 1022 | ################################# |
|
|
1023 | # stripping: saved backup bundle to $TESTTMP/lonely-prune/.hg/strip-backup/cefb651fc2fd-345c8dfa-backup.hg | |
|
|
1024 | ### Backup markers ### | |
|
|
1025 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
1026 | ### diff <relevant> <backed-up> ### | |
|
|
1027 | ################################# | |
|
|
1028 | # unbundling: adding changesets | |
|
|
1029 | # unbundling: adding manifests | |
|
|
1030 | # unbundling: adding file changes | |
|
|
1031 | # unbundling: added 1 changesets with 1 changes to 1 files | |
|
|
1032 | # unbundling: (run 'hg update' to get a working copy) | |
General Comments 0
You need to be logged in to leave comments.
Login now