RE: How to treat XML files checked into CVS

[Arthur Barrett]

Paul,

> > Hmmm interesting... Not really sure if that covers all the possible
> > places a merge is initiated, but still insteresting.
> 
> At the time I posted the patch, CVS had a wrapper function 
> around the  
> 3-way merge.  


I think this is very interesting and I've added an enhancement request
(5244) on CVSNT for this, but no idea if/when we'll get to it.  I've
added you to the cc list on the bug so if we do move the issue along you
should get notified.
http://customer.march-hare.com/webtools/bugzilla/ttshow_bug.cgi?tt=1&id=
5244

Thanks again for your time in helping me understand your proposal and in
submitting the patch in the first place.

Regards,


Arthur Barrett