[cvsnt] Mergepoint numbering?

[John Kinson]

Tony, just to be clear, this is a bug: if I merge two branches to the 
trunk, commit once, make further changes on both branches, then attempt 
to merge a second time, then one of the branches may needlessly generate 
conflicts as the mergepoint will be missing (the entire branch will be 
merged again).

The workaround is obviously to only ever merge one branch at a time and 
commit before merging the next branch, which is good practice for 
traceability anyway.

Cheers

JK

John Kinson wrote:

> Anyone know what the "1" suffix to the mergepoint attribute name inside 
> CVSnt ",v" RCS files signifies?  I was expecting it to be used to 
> support multiple mergepoints per revision (i.e. increment for each 
> mergepoint), but it doesn't look like CVSnt can handle this.
> 
> (An example scenario would be where a file is modified for two branches, 
> then "cvs upd -j" is used twice to merge both branches to the trunk, 
> followed by a single commit.  CVSnt just records the last merge, not 
> both merges.)
> 
> Cheers
> 
> JK


-- 
http://www.yellowradio.com/

If technology doesn't seem like magic,
it's probably obsolete.