bug-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: CVS can't recognize identical changes when merging


From: Derek R. Price
Subject: Re: CVS can't recognize identical changes when merging
Date: Fri, 19 Jan 2001 16:57:55 -0500

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...

Derek

--
Derek Price                      CVS Solutions Architect ( http://CVSHome.org )
mailto:address@hidden     OpenAvenue ( http://OpenAvenue.com )
--
"Thank GOD Microsoft doesn't build airplanes."






reply via email to

[Prev in Thread] Current Thread [Next in Thread]