257 updating to branch default |
257 updating to branch default |
258 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
258 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
259 getting changed largefiles |
259 getting changed largefiles |
260 3 largefiles updated, 0 removed |
260 3 largefiles updated, 0 removed |
261 $ cd b |
261 $ cd b |
262 $ hg log |
262 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' |
263 changeset: 7:daea875e9014 |
263 7:daea875e9014 add/edit more largefiles |
264 tag: tip |
264 6:4355d653f84f edit files yet again |
265 user: test |
265 5:9d5af5072dbd edit files again |
266 date: Thu Jan 01 00:00:00 1970 +0000 |
266 4:74c02385b94c move files |
267 summary: add/edit more largefiles |
267 3:9e8fbc4bce62 copy files |
268 |
268 2:51a0ae4d5864 remove files |
269 changeset: 6:4355d653f84f |
269 1:ce8896473775 edit files |
270 user: test |
270 0:30d30fe6a5be add files |
271 date: Thu Jan 01 00:00:00 1970 +0000 |
|
272 summary: edit files yet again |
|
273 |
|
274 changeset: 5:9d5af5072dbd |
|
275 user: test |
|
276 date: Thu Jan 01 00:00:00 1970 +0000 |
|
277 summary: edit files again |
|
278 |
|
279 changeset: 4:74c02385b94c |
|
280 user: test |
|
281 date: Thu Jan 01 00:00:00 1970 +0000 |
|
282 summary: move files |
|
283 |
|
284 changeset: 3:9e8fbc4bce62 |
|
285 user: test |
|
286 date: Thu Jan 01 00:00:00 1970 +0000 |
|
287 summary: copy files |
|
288 |
|
289 changeset: 2:51a0ae4d5864 |
|
290 user: test |
|
291 date: Thu Jan 01 00:00:00 1970 +0000 |
|
292 summary: remove files |
|
293 |
|
294 changeset: 1:ce8896473775 |
|
295 user: test |
|
296 date: Thu Jan 01 00:00:00 1970 +0000 |
|
297 summary: edit files |
|
298 |
|
299 changeset: 0:30d30fe6a5be |
|
300 user: test |
|
301 date: Thu Jan 01 00:00:00 1970 +0000 |
|
302 summary: add files |
|
303 |
|
304 $ cat normal3 |
271 $ cat normal3 |
305 normal33 |
272 normal33 |
306 $ cat sub/normal4 |
273 $ cat sub/normal4 |
307 normal44 |
274 normal44 |
308 $ cat sub/large4 |
275 $ cat sub/large4 |
320 updating to branch default |
287 updating to branch default |
321 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
288 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
322 getting changed largefiles |
289 getting changed largefiles |
323 2 largefiles updated, 0 removed |
290 2 largefiles updated, 0 removed |
324 $ cd c |
291 $ cd c |
325 $ hg log |
292 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' |
326 changeset: 3:9e8fbc4bce62 |
293 3:9e8fbc4bce62 copy files |
327 tag: tip |
294 2:51a0ae4d5864 remove files |
328 user: test |
295 1:ce8896473775 edit files |
329 date: Thu Jan 01 00:00:00 1970 +0000 |
296 0:30d30fe6a5be add files |
330 summary: copy files |
|
331 |
|
332 changeset: 2:51a0ae4d5864 |
|
333 user: test |
|
334 date: Thu Jan 01 00:00:00 1970 +0000 |
|
335 summary: remove files |
|
336 |
|
337 changeset: 1:ce8896473775 |
|
338 user: test |
|
339 date: Thu Jan 01 00:00:00 1970 +0000 |
|
340 summary: edit files |
|
341 |
|
342 changeset: 0:30d30fe6a5be |
|
343 user: test |
|
344 date: Thu Jan 01 00:00:00 1970 +0000 |
|
345 summary: add files |
|
346 |
|
347 $ cat normal1 |
297 $ cat normal1 |
348 normal22 |
298 normal22 |
349 $ cat large1 |
299 $ cat large1 |
350 large22 |
300 large22 |
351 $ cat sub/normal2 |
301 $ cat sub/normal2 |
398 added 1 changesets with 2 changes to 2 files (+1 heads) |
348 added 1 changesets with 2 changes to 2 files (+1 heads) |
399 getting changed largefiles |
349 getting changed largefiles |
400 1 largefiles updated, 0 removed |
350 1 largefiles updated, 0 removed |
401 saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg |
351 saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg |
402 nothing to rebase |
352 nothing to rebase |
403 $ hg log |
353 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' |
404 changeset: 9:598410d3eb9a |
354 9:598410d3eb9a modify normal file largefile in repo d |
405 tag: tip |
355 8:a381d2c8c80e modify normal file and largefile in repo b |
406 user: test |
356 7:daea875e9014 add/edit more largefiles |
407 date: Thu Jan 01 00:00:00 1970 +0000 |
357 6:4355d653f84f edit files yet again |
408 summary: modify normal file largefile in repo d |
358 5:9d5af5072dbd edit files again |
409 |
359 4:74c02385b94c move files |
410 changeset: 8:a381d2c8c80e |
360 3:9e8fbc4bce62 copy files |
411 user: test |
361 2:51a0ae4d5864 remove files |
412 date: Thu Jan 01 00:00:00 1970 +0000 |
362 1:ce8896473775 edit files |
413 summary: modify normal file and largefile in repo b |
363 0:30d30fe6a5be add files |
414 |
|
415 changeset: 7:daea875e9014 |
|
416 user: test |
|
417 date: Thu Jan 01 00:00:00 1970 +0000 |
|
418 summary: add/edit more largefiles |
|
419 |
|
420 changeset: 6:4355d653f84f |
|
421 user: test |
|
422 date: Thu Jan 01 00:00:00 1970 +0000 |
|
423 summary: edit files yet again |
|
424 |
|
425 changeset: 5:9d5af5072dbd |
|
426 user: test |
|
427 date: Thu Jan 01 00:00:00 1970 +0000 |
|
428 summary: edit files again |
|
429 |
|
430 changeset: 4:74c02385b94c |
|
431 user: test |
|
432 date: Thu Jan 01 00:00:00 1970 +0000 |
|
433 summary: move files |
|
434 |
|
435 changeset: 3:9e8fbc4bce62 |
|
436 user: test |
|
437 date: Thu Jan 01 00:00:00 1970 +0000 |
|
438 summary: copy files |
|
439 |
|
440 changeset: 2:51a0ae4d5864 |
|
441 user: test |
|
442 date: Thu Jan 01 00:00:00 1970 +0000 |
|
443 summary: remove files |
|
444 |
|
445 changeset: 1:ce8896473775 |
|
446 user: test |
|
447 date: Thu Jan 01 00:00:00 1970 +0000 |
|
448 summary: edit files |
|
449 |
|
450 changeset: 0:30d30fe6a5be |
|
451 user: test |
|
452 date: Thu Jan 01 00:00:00 1970 +0000 |
|
453 summary: add files |
|
454 |
|
455 $ cat normal3 |
364 $ cat normal3 |
456 normal3-modified |
365 normal3-modified |
457 $ cat sub/normal4 |
366 $ cat sub/normal4 |
458 normal4-modified |
367 normal4-modified |
459 $ cat sub/large4 |
368 $ cat sub/large4 |
762 adding manifests |
671 adding manifests |
763 adding file changes |
672 adding file changes |
764 added 1 changesets with 2 changes to 2 files |
673 added 1 changesets with 2 changes to 2 files |
765 getting changed largefiles |
674 getting changed largefiles |
766 1 largefiles updated, 0 removed |
675 1 largefiles updated, 0 removed |
767 $ hg log |
676 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' |
768 changeset: 9:598410d3eb9a |
677 9:598410d3eb9a modify normal file largefile in repo d |
769 tag: tip |
678 8:a381d2c8c80e modify normal file and largefile in repo b |
770 user: test |
679 7:daea875e9014 add/edit more largefiles |
771 date: Thu Jan 01 00:00:00 1970 +0000 |
680 6:4355d653f84f edit files yet again |
772 summary: modify normal file largefile in repo d |
681 5:9d5af5072dbd edit files again |
773 |
682 4:74c02385b94c move files |
774 changeset: 8:a381d2c8c80e |
683 3:9e8fbc4bce62 copy files |
775 user: test |
684 2:51a0ae4d5864 remove files |
776 date: Thu Jan 01 00:00:00 1970 +0000 |
685 1:ce8896473775 edit files |
777 summary: modify normal file and largefile in repo b |
686 0:30d30fe6a5be add files |
778 |
|
779 changeset: 7:daea875e9014 |
|
780 user: test |
|
781 date: Thu Jan 01 00:00:00 1970 +0000 |
|
782 summary: add/edit more largefiles |
|
783 |
|
784 changeset: 6:4355d653f84f |
|
785 user: test |
|
786 date: Thu Jan 01 00:00:00 1970 +0000 |
|
787 summary: edit files yet again |
|
788 |
|
789 changeset: 5:9d5af5072dbd |
|
790 user: test |
|
791 date: Thu Jan 01 00:00:00 1970 +0000 |
|
792 summary: edit files again |
|
793 |
|
794 changeset: 4:74c02385b94c |
|
795 user: test |
|
796 date: Thu Jan 01 00:00:00 1970 +0000 |
|
797 summary: move files |
|
798 |
|
799 changeset: 3:9e8fbc4bce62 |
|
800 user: test |
|
801 date: Thu Jan 01 00:00:00 1970 +0000 |
|
802 summary: copy files |
|
803 |
|
804 changeset: 2:51a0ae4d5864 |
|
805 user: test |
|
806 date: Thu Jan 01 00:00:00 1970 +0000 |
|
807 summary: remove files |
|
808 |
|
809 changeset: 1:ce8896473775 |
|
810 user: test |
|
811 date: Thu Jan 01 00:00:00 1970 +0000 |
|
812 summary: edit files |
|
813 |
|
814 changeset: 0:30d30fe6a5be |
|
815 user: test |
|
816 date: Thu Jan 01 00:00:00 1970 +0000 |
|
817 summary: add files |
|
818 |
|
819 $ cat normal3 |
687 $ cat normal3 |
820 normal3-modified |
688 normal3-modified |
821 $ cat sub/normal4 |
689 $ cat sub/normal4 |
822 normal4-modified |
690 normal4-modified |
823 $ cat sub/large4 |
691 $ cat sub/large4 |