view tests/test-convert-cvsnt-mergepoints.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.

% create cvs repository
cvs -f -Q -d *REPO* init
% checkout #1: add foo.txt
cvs -f -Q checkout -d cvsworktmp .
cvs -f -Q add foo
cvs -f -Q add foo.txt
cvs -f ci -f -m add foo.txt foo.txt
initial revision: 1.1
% checkout #2: create MYBRANCH1 and modify foo.txt on it
cvs -f -Q checkout -d cvswork foo
cvs -f -q rtag -b -R MYBRANCH1 foo
cvs -f -Q update -P -r MYBRANCH1
cvs -f ci -f -m bar foo.txt
new revision: 1.1.2.1; previous revision: 1.1
cvs -f ci -f -m baz foo.txt
new revision: 1.1.2.2; previous revision: 1.1.2.1
% create MYBRANCH1_2 and modify foo.txt some more
cvs -f -q rtag -b -R -r MYBRANCH1 MYBRANCH1_2 foo
cvs -f -Q update -P -r MYBRANCH1_2
cvs -f ci -f -m bazzie foo.txt
new revision: 1.1.2.2.2.1; previous revision: 1.1.2.2
% create MYBRANCH1_1 and modify foo.txt yet again
cvs -f -q rtag -b -R MYBRANCH1_1 foo
cvs -f -Q update -P -r MYBRANCH1_1
cvs -f ci -f -m quux foo.txt
new revision: 1.1.4.1; previous revision: 1.1
% merge MYBRANCH1 to MYBRANCH1_1
rcsmerge: warning: conflicts during merge
cvs -f -Q update -P -jMYBRANCH1
RCS file: *REPO*/foo/foo.txt,v
retrieving revision 1.1
retrieving revision 1.1.2.2
Merging differences between 1.1 and 1.1.2.2 into foo.txt
cvs -f ci -f -m merge1+clobber foo.txt
new revision: 1.1.4.2; previous revision: 1.1.4.1
% return to trunk and merge MYBRANCH1_2
cvs -f -Q update -P -A
cvs -f -Q update -P -jMYBRANCH1_2
RCS file: *REPO*/foo/foo.txt,v
retrieving revision 1.1
retrieving revision 1.1.2.2.2.1
Merging differences between 1.1 and 1.1.2.2.2.1 into foo.txt
cvs -f ci -f -m merge2 foo.txt
new revision: 1.2; previous revision: 1.1
collecting CVS rlog
7 log entries
creating changesets
7 changeset entries
---------------------
PatchSet 1 
Date:
Author:
Branch: HEAD
Tag: (none) 
Branchpoints: MYBRANCH1_1, MYBRANCH1 
Log:
foo.txt

Members: 
	foo.txt:INITIAL->1.1 

---------------------
PatchSet 2 
Date:
Author:
Branch: MYBRANCH1
Tag: (none) 
Parent: 1
Log:
bar

Members: 
	foo.txt:1.1->1.1.2.1 

---------------------
PatchSet 3 
Date:
Author:
Branch: MYBRANCH1
Tag: (none) 
Branchpoints: MYBRANCH1_2 
Parent: 2
Log:
baz

Members: 
	foo.txt:1.1.2.1->1.1.2.2 

---------------------
PatchSet 4 
Date:
Author:
Branch: MYBRANCH1_1
Tag: (none) 
Parent: 1
Log:
quux

Members: 
	foo.txt:1.1->1.1.4.1 

---------------------
PatchSet 5 
Date:
Author:
Branch: MYBRANCH1_2
Tag: (none) 
Parent: 3
Log:
bazzie

Members: 
	foo.txt:1.1.2.2->1.1.2.2.2.1 

---------------------
PatchSet 6 
Date:
Author:
Branch: HEAD
Tag: (none) 
Parents: 1,5
Log:
merge

Members: 
	foo.txt:1.1->1.2 

---------------------
PatchSet 7 
Date:
Author:
Branch: MYBRANCH1_1
Tag: (none) 
Parents: 4,3
Log:
merge

Members: 
	foo.txt:1.1.4.1->1.1.4.2