equal
deleted
inserted
replaced
454 searching for changes |
454 searching for changes |
455 adding changesets |
455 adding changesets |
456 adding manifests |
456 adding manifests |
457 adding file changes |
457 adding file changes |
458 added 3 changesets with 5 changes to 5 files |
458 added 3 changesets with 5 changes to 5 files |
459 new changesets 9530e27857f7:d65e59e952a9 |
459 new changesets 9530e27857f7:d65e59e952a9 (3 drafts) |
460 remote turned local largefile large2 into a normal file |
460 remote turned local largefile large2 into a normal file |
461 keep (l)argefile or use (n)ormal file? l |
461 keep (l)argefile or use (n)ormal file? l |
462 largefile large1 has a merge conflict |
462 largefile large1 has a merge conflict |
463 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 |
463 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 |
464 keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or |
464 keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or |
490 $ hg unbundle --update --config debug.dirstate.delaywrite=2 $TESTTMP/9530e27857f7-2e7b195d-backup.hg |
490 $ hg unbundle --update --config debug.dirstate.delaywrite=2 $TESTTMP/9530e27857f7-2e7b195d-backup.hg |
491 adding changesets |
491 adding changesets |
492 adding manifests |
492 adding manifests |
493 adding file changes |
493 adding file changes |
494 added 3 changesets with 5 changes to 5 files |
494 added 3 changesets with 5 changes to 5 files |
495 new changesets 9530e27857f7:d65e59e952a9 |
495 new changesets 9530e27857f7:d65e59e952a9 (3 drafts) |
496 remote turned local largefile large2 into a normal file |
496 remote turned local largefile large2 into a normal file |
497 keep (l)argefile or use (n)ormal file? l |
497 keep (l)argefile or use (n)ormal file? l |
498 largefile large1 has a merge conflict |
498 largefile large1 has a merge conflict |
499 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 |
499 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 |
500 keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or |
500 keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or |