[ On Friday, April 14, 2000 at 17:49:22 (-0400), Dave Makower wrote: ]
> Subject: Re: Long term branch development - merges become problematic.
>
> I was really hoping somebody would contradict me on this and say,
> "Don't be an idiot, there's an easy way to do it!" Is the truth
> really as bleak as I painted it? Can it really be true that if you
> have binary files and text files in your repository, and there are
> keywords in your text files, there is no single cvs command that will
> merge onto a long-lived branch, avoiding spurious conflicts? (Even
> if you are careful to tag the source of every incremental merge?)
Well since CVS wasn't designed to handle binary files, and since
at least some RCS keywords have always been problematic, I'm not at all
surprised.
In general you can't merge binaries, and the existing merge tools see
some changes in keywords as conflicts. You get what you pay for.
--
Greg A. Woods
+1 416 218-0098 VE3TCP <[EMAIL PROTECTED]> <robohack!woods>
Planix, Inc. <[EMAIL PROTECTED]>; Secrets of the Weird <[EMAIL PROTECTED]>
