>Date: Fri, 19 Jan 2001 16:57:55 -0500
>From: "Derek R. Price" <[EMAIL PROTECTED]>
>To: Stephen Rasku <[EMAIL PROTECTED]>
>CC: [EMAIL PROTECTED]
>Subject: Re: CVS can't recognize identical changes when merging
>
>Stephen Rasku wrote:
>
>> Found on CVS 1.10.8
>>
>> If make a branch tag on a file and then make the identical change
on
>> the branch and on the trunk and then try to merge from the branch
to
>> the trunk you will get conflicts. CVS should recognize that the
>> conflicts are identical and just keep one copy.
>
>It usually does, but I don't know when the change went in. I thought
it
>was before 1.10.8. You might want to upgrade to 1.11.
>
>Aside from that, perhaps the change wasn't really identical? A
single
>character difference is all it takes...
>
Well, I reduced the number of conflicts from 20 files down to 3 by
using a base tag. That is, using:
cvs update -kk -j branch-base -j branch
instead of just:
cvs update -kk -j branch
So the changes must be identical or the conflicts would still be there
when using a base tag.
I'll test this on cvs 1.11 and see if it still occurs.
--
Stephen Rasku E-mail: [EMAIL PROTECTED]
Senior Software Engineer Web: http://www.tgivan.com/
TGI Technologies http://www.pop-star.net/
_______________________________________________
Bug-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/bug-cvs
