view tests/test-strip-cross.out @ 10397:8cb81d75730c

mq: add parent node IDs to MQ patches on qrefresh/qnew

The goal of this patch is to add the IDs of the parents of applied MQ patches
into the patch file headers whenever qnew or qrefresh are run.

This will serve as a reminder of when the patches last applied cleanly and
will let us do more intelligent things in the future, such as:

    * Resolve conflicts found when qpushing to a new location by merging
      instead of simply showing rejects.

    * Display better diffs of versioned MQ patches because we can tell how the
      patched files have changed in the meantime.

Here are the new rules this patch introduces.  They are checked in this order:

    * If a patch currently has old, plain-style patch headers ("From:" and
      "Date:") do not change the style or add any new headers.

    * If the 'mq.plain' configuration setting is true, only plain-style
      headers will be used for all MQ patches.

    * qnew will initialize new patches with HG-style headers and fill in the
      "# Parent" header with the appropriate parent node.

    * qrefresh will refresh the "# Parent" header with the current parent of
      the current patch.

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