[cvsnt] But...

[John Peacock]

Glen Starrett wrote:

>>1) Repetitive merges from a branch requires special handling, because
> 
> you only 
> 
>>want to apply changes that were not already made, see
>>
>>http://cvsbook.red-bean.com/cvsbook.html#Multiple_Merges
> 
> 
> Note that the above does not apply to cvsnt--see the discussions on
> "mergepoint".  Mergepoint remembers where a file was last merged from
> another and uses that to correctly determine the common ancestor.
> 

Oops, you're right.  I forgot that Tony had added that (the nice examples from 
the free book predate that).  I always use the "Flying Fish" model, so any 
branches are short-lived and don't need multiple merges...

John

-- 
John Peacock
Director of Information Research and Technology
Rowman & Littlefield Publishing Group
4501 Forbes Boulevard
Suite H
Lanham, MD  20706
301-459-3366 x.5010
fax 301-429-5748