view tests/test-strip-cross.out @ 6521:a3668330f14a

test that internal merge tools are used when set for a merge-pattern in hgrc It is possible to specify that one of the internal merge tools (internal:fail, internal:local or internal:other) should be used for performing merges on files matching a given pattern. This test makes sure that such a setting actually works.
author Dov Feldstern <dfeldstern@fastimap.com>
date Fri, 04 Apr 2008 02:20:58 +0300
parents d67cfe0d4714
children 4bb4895e1693
line wrap: on
line source

crossed/.hg/store/00manifest.i
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0     112      0       0 6f105cbb914d 000000000000 000000000000
     1       112      56      1       3 1b55917b3699 000000000000 000000000000
     2       168     123      1       1 8f3d04e263e5 000000000000 000000000000
     3       291     122      1       2 f0ef8726ac4f 000000000000 000000000000
     4       413      87      4       4 0b76e38b4070 000000000000 000000000000

crossed/.hg/store/data/012.i
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       3      0       0 b8e02f643373 000000000000 000000000000
     1         3       3      1       1 5d9299349fc0 000000000000 000000000000
     2         6       3      2       2 2661d26c6496 000000000000 000000000000

crossed/.hg/store/data/021.i
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       3      0       0 b8e02f643373 000000000000 000000000000
     1         3       3      1       2 5d9299349fc0 000000000000 000000000000
     2         6       3      2       1 2661d26c6496 000000000000 000000000000

crossed/.hg/store/data/102.i
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       3      0       1 b8e02f643373 000000000000 000000000000
     1         3       3      1       0 5d9299349fc0 000000000000 000000000000
     2         6       3      2       2 2661d26c6496 000000000000 000000000000

crossed/.hg/store/data/120.i
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       3      0       1 b8e02f643373 000000000000 000000000000
     1         3       3      1       2 5d9299349fc0 000000000000 000000000000
     2         6       3      2       0 2661d26c6496 000000000000 000000000000

crossed/.hg/store/data/201.i
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       3      0       2 b8e02f643373 000000000000 000000000000
     1         3       3      1       0 5d9299349fc0 000000000000 000000000000
     2         6       3      2       1 2661d26c6496 000000000000 000000000000

crossed/.hg/store/data/210.i
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       3      0       2 b8e02f643373 000000000000 000000000000
     1         3       3      1       1 5d9299349fc0 000000000000 000000000000
     2         6       3      2       0 2661d26c6496 000000000000 000000000000

crossed/.hg/store/data/manifest-file.i
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       3      0       3 b8e02f643373 000000000000 000000000000
     1         3       3      1       4 5d9299349fc0 000000000000 000000000000

% Trying to strip revision 0
saving bundle to strip-backup/cbb8c2f0a2e3-backup
saving bundle to strip-backup/cbb8c2f0a2e3-temp
adding branch
adding changesets
adding manifests
adding file changes
added 4 changesets with 15 changes to 7 files (+3 heads)
% Verifying
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
7 files, 4 changesets, 15 total revisions

% Trying to strip revision 1
saving bundle to strip-backup/124ecc0cbec9-backup
saving bundle to strip-backup/124ecc0cbec9-temp
adding branch
adding changesets
adding manifests
adding file changes
added 3 changesets with 12 changes to 7 files (+3 heads)
% Verifying
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
7 files, 4 changesets, 14 total revisions

% Trying to strip revision 2
saving bundle to strip-backup/f6439b304a1a-backup
saving bundle to strip-backup/f6439b304a1a-temp
adding branch
adding changesets
adding manifests
adding file changes
added 2 changesets with 8 changes to 6 files (+2 heads)
% Verifying
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
7 files, 4 changesets, 14 total revisions

% Trying to strip revision 3
saving bundle to strip-backup/6e54ec5db740-backup
saving bundle to strip-backup/6e54ec5db740-temp
adding branch
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 2 files (+1 heads)
% Verifying
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
7 files, 4 changesets, 19 total revisions

% Trying to strip revision 4
saving bundle to strip-backup/9147ea23c156-backup
% Verifying
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
7 files, 4 changesets, 19 total revisions