Re: Is there anyway to not change a file when there are conflicts?

[Pierre Asselin]

"Stanton, Curt (NCI/IMS)" <address@hidden> writes:

>Here is the problem.  When CVS tries to merge a file and fails, it creates
>the two different versions of the code snippit seperated by the
>>>>>>=====<<<<<.  Or somesymbols like that.  We find that to be hard to deal
>with most of the time.  We use another program called beyond compare to
>merge the two together.  We do this by getting rid of the file it crearted
>with those symbols and starting with the working copies modified file and
>the newest repo version.  My question is.  Is there any way to leave the
>file as is (in the not updated modified state) and mark it as having a
>conflict?  We still want it to merge the two if there weren't conflicts.
>Thanks in advance

-m 'COPY' in a .cvsignore file.  See the entry for 'cvsignore' in the
manual.  With that, "cvs update" should leave the conflicting copies
in your directiry --not sure how they will be called, I don't use that
feature much.

--
Pierre Asselin
Westminster, Colorado


-----= Posted via Newsfeeds.Com, Uncensored Usenet News =-----
http://www.newsfeeds.com - The #1 Newsgroup Service in the World!
-----==  Over 80,000 Newsgroups - 16 Different Servers! =-----