2011-08-11 06:57 AEST by Glen Starrett - This repro done with CVS Suite 2009R2 build 4218.

Trying this out, create P_DEV_FIX3 off of version 1.1.8.3 and try to merge in:
	C:\Users\Glen Starrett\Documents\Test\europa-cust>cvs -d :sspi:localhost:/cust c
	o -d ELC-P_DEV_FIX3 -r P_DEV_FIX3 ELC
	cvsntsrv server: Updating ELC-P_DEV_FIX3
	cvsntsrv server: Updating ELC-P_DEV_FIX3/blah
	U ELC-P_DEV_FIX3/blah/TEST_PRC.PRC
	cvsntsrv server: Updating ELC-P_DEV_FIX3/f
	
	C:\Users\Glen Starrett\Documents\Test\europa-cust>cd ELC-P_DEV_FIX3
	C:\Users\Glen Starrett\Documents\Test\europa-cust\ELC-P_DEV_FIX3>cd blah
	C:\Users\Glen Starrett\Documents\Test\europa-cust\ELC-P_DEV_FIX3\blah>dir
	 Volume in drive C is OS
	 Volume Serial Number is 662A-18BA
	
	 Directory of C:\Users\Glen Starrett\Documents\Test\europa-cust\ELC-P_DEV_FIX3\b
	lah
	
	08/10/2011  11:31 AM    <DIR>          .
	08/10/2011  11:31 AM    <DIR>          ..
	06/13/2011  03:38 PM             5,061 TEST_PRC.PRC
	               1 File(s)          5,061 bytes
	               2 Dir(s)  392,956,702,720 bytes free
	
	C:\Users\Glen Starrett\Documents\Test\europa-cust\ELC-P_DEV_FIX3\blah>cvs up -j
	HEAD
	cvsntsrv server: Updating .
	RCS file: /cust/ELC/blah/TEST_PRC.PRC,v
	retrieving revision 1.1
	retrieving revision 1.12
	Merging differences between 1.1 and 1.12 into TEST_PRC.PRC
	rcsmerge: warning: conflicts during merge
	C TEST_PRC.PRC
	U foo.prc
	U test2.prc
	
	
OK, there's still conflict, but it's grabbing the wrong diff set.  Should be
grabbing 1.6 - 1.12, not 1.1 - 1.12.  Clean up and try this another way:

	C:\Users\Glen Starrett\Documents\Test\europa-cust\ELC-P_DEV_FIX3\blah>cvs up -Cd
	P
	… more cleanup …
	
	C:\Users\Glen Starrett\Documents\Test\europa-cust\ELC-P_DEV_FIX3\blah>cvs up
	cvsntsrv server: Updating .
	
	C:\Users\Glen Starrett\Documents\Test\europa-cust\ELC-P_DEV_FIX3\blah>cvs up -j
	1.6 -j 1.9
	cvsntsrv server: Updating .
	RCS file: /cust/ELC/blah/TEST_PRC.PRC,v
	retrieving revision 1.6
	retrieving revision 1.9
	Merging differences between 1.6 and 1.9 into TEST_PRC.PRC
	
That's what I'd expect.  Seems branching off a promotion branch isn't going to
work so good.

Also note that the mergepoint wasn't set on that last commit.  Probably still
going to always have conflict??