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

Following is a demonstration-quality patch to show how CVS can be modified to replace its existing merge capability with an extensible mechanism that can be configured to handle merging in any way the CVS admin sees fit. What happens is that CVS' invocation diff3 to perform the merge is replaced

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

If a file has conflicts when merging, the original is saved as .#original_name.x where x is the revision number the working copy is based on (I think). -Damian > From: "Stanton, Curt (NCI/IMS)" <[EMAIL PROTECTED]> > To: "'[EMAIL PROTECTED]'" <[EMAIL PROTECTED]> > Subject: Is there anyway to not

history output to file

how can i output the results of a history command to a file? p.s.- i am using winCVS steve jones software quality engineer mindflow technologies, inc 972.930.9988 x112 [EMAIL PROTECTED] ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org

Crystal Clear Conference Calls/18 cents per min.

Title: Take Control Of Your Conference Calls Long Distance ConferencingOnly 18 Cents Per Minute Connects Up To 100 Participants! No setup fees No contracts or monthly fees Call anytime, from anywhere, to anywhere International Dial In 18 cen

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

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

Re: email notification problem

muneer writes: > > Such a simple featus of cvs doesn't work, and i can't seem to see > what's glaringly wrong. The CVSROOT/notify file has been set up as > required to send edit/watch emails to the users and email addresses > defined in the CVSROOT/users file. But one small problem, the notif

Re: Connection refused to CVS repository (and ACLs).

Axelle writes: > > I have set up a locally mounted CVS repository, to share sources between 2 > of us on a same project. > I can checkout files without any problem, but the other user can't and gets > a > "cvs [checkout aborted]: connect to machine:2401 failed: Connection refused" The other user

Logging Commits

Hi Guys, We are trying to setup logging of commits etc under CVS. We have updated the loginfo file in the CVSROOT directory to log what we need. The question that I have is what happens about branches. Basically we only want commits to the main branch to be logged, not commits to user created bra

Re: Connection refused to CVS repository (and ACLs).

I think there may be atomicity problems when mounting a CVS repository via NFS. I'm assuming you're asking about POSIX file system ACLs. It's perfectly fine to use ACLs within the CVS repo, in fact I promote them since it makes things much simpler. However, be sure you understand exactly how pe

Connection refused to CVS repository (and ACLs).

Hi, I have set up a locally mounted CVS repository, to share sources between 2 of us on a same project. I can checkout files without any problem, but the other user can't and gets a "cvs [checkout aborted]: connect to machine:2401 failed: Connection refused" What is most surprising is that the us