Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.
"Tony Hoyle" <tmh at nodomain.org> wrote in message news:pksm90p7ei63q93tdcr4242ts27ub39o1b at 4ax.com... > On Fri, 7 May 2004 09:27:50 +0100, "Harrison, Andrew" > I'm always open to persuasion... however I prefer to err on the side > of paranoia. Sorry to repeat myself, but can the following be put into code? I cannot find where such an algorithm can go wrong, altough I am not sure if it degrades performance. >>Can CVS check if the file *contents* are identical when doing a merge? What >>I mean is that in the scenario described revisions 1.9.6.1 that corresponds >>to revision 1.10 (its mergepoint) are identical. Thus CVS can detect that >>the only changes from 1.10 to 1.11 (file deleted) have occurred on the trunk >>and can safely be applied to the branch. > > Liked your diagram though... That just about persuaded me it's doing > the right thing :) 10x but that is just an imitation of WinCVS graph :-P -- Kevin Agius