Logging Commits

2002-01-09 Thread Robert Keith
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

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

2002-01-09 Thread Larry Jones
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 has

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

2002-01-09 Thread Stanton, Curt (NCI/IMS)
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

Crystal Clear Conference Calls/18 cents per min.

2002-01-09 Thread [EMAIL PROTECTED]
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

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

2002-01-09 Thread Damian Wiest
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 change a