cvs

Can you recommend a .cvsignore file for a Visual C#.NET solution?

Hi all, I've developed a Visual C#.NET 2008 Express Edition solution containing three projects. I am cleaning it up to commit it into a CVS repository. There are several files that are created during the build process that are not necessary to be placed in the repository since they will be regenerated automatically. The question: Can ...

When using cvs2svn how can you rename symbols such that a branch and tag resolve to the same name?

I am working on converting a CVS repository that has the following symbols (among others): tcm-6.1.0-branch -- a branch tcm-6.1.0 -- a tag Using the standard transformations cvs2svn identifies them properly. However, I'd like to do some clean up during the conversion. Specifically I'd like to drop the redundant '-branch' portion of...

Is there any reasonable way to migrate from subversion to cvs?

My company unwittingly switched from cvs to subversion and now we're all wishing we had cvs back. I know there's tools to migrate history and changes from cvs to svn and there's no equivalent to do the reverse. Any suggestions or ideas on how to do this? ...

Is there a source-control system that allows tracking of file name changes?

So, I've been living with my cvs repositories for some time. Though there is a thing I miss - if i rename a file that is already in repository, I need to delete the one with old name from there and add the new one. Hence, I loose all my change-history. And sometimes there's a need to rename a file in alredy existing project. From what I...

How to acquire specific revision of a newly added file from CVS via command line?

One of our internally written tool is fed a cvs commit trace of the form: Checking in src/com/package/AFile.java; /home/cvs/src/com/package/AFile.java,v <-- Afile.java new revision: 1.1.2.56; previous revision: 1.1.2.55 done The tool then acquires the file from cvs by issuing a "cvs update -r 1.1.2.56" command in a working ...

"read lock failed" at cvs annotate

I am trying to use cvs annotate. This is the what I run: cvs -d /mycvs/cvsroot/ annotate "projects/dg/SomeClass.java" However, I get the following error: cvs annotate: failed to create lock directory for `/mycvs/cvsroot/projects/dg^M' (/mycvs/cvsroot/projects/dg^M/#cvs.lock): No such file or directory cvs annotate: failed to obtain d...

Can CVS and Subversion be set to ignore whitespace in merging?

CVS and Subversion both have a handy merge feature so that when you update a source file that you have modified, it merges in changes that others have made on the same file. However, if your changes and the other ones are incompatible - generally if you have both changed the same parts of the code - it will create a conflict. Both stret...

Merge tools that ignores $Id lines

I need to merge a forked project. Unfortunately, the CVS $Id lines are different so the merge tools I tried report that all the files are different (and 95% of them have only this line different) Is there a merge tool that can be configured to ignore line comparison results based on a pattern ? [edit] I discovered that WinMerge has li...

Is there a way to replace the diff utility, with another, non-Tcl/Tk diff utility?

I'm using TkCVS as the GUI front-end for a CYGWIN CVS client, on a Windows XP machine. It's a good compromise, since on my Linux machine I'm also running TkCVS (the same machine running the CVS server, BTW...). I'm interested in replacing the diff utility (which has a tkdiff.tcl GUI front-end, for TkCVS) with a commercial product (like ...

Remove empty directory from CVS?

I'm not quite sure how this happened, but somehow a completely empty hierarchy of directories has ended up in my repository: com/ com/companyname/ com/companyname/blah/ com/sun/ com/sun/java/ com/sun/java/jax_rpc_ri/ I think what happened was that these directories did have files in them, but then a developer realized he/she shouldn't...

Is there a way to get a short CVS status from command line?

When doing a cvs update, you get a nice summary of the state of the repository, for example: M src/file1.txt M src/file2.txt C src/file3.txt A src/file4.txt ? src/file5.txt Is there a way to get this without actually updating? I know there is cvs status, but this is way to verbose: ====================================================...

CVS tab completion for modules under Linux

How can I get tab completion to work for selecting CVS modules under Linux (preferably using bash) ? For example, "cvs co " + tab would list the modules I can checkout. I've heard it's easy to do using zsh, but still I didn't manage to get it working either. Also, how can I list all available modules (or repositories?) available in th...

How to ignore CVS keyword tags in eclipse diff

As much as i like the eclipse diff/merge perspective, when dealing with large projects and multiple branches that need to be merged occasionally there's one feature missing: Is there any way to set the eclipse diff to ignore the CVS tags like $Author:$, $Revision:$ and so on? Since these tags are different in all the branches, a "compa...

Is there an easy way to do a complete migration from CVS to StarTeam?

I'm currently maintaining a CVS repository for source control. There is a push afoot to move to StarTeam. It has already been purchased and is a corporate standard for most projects. I was told by the corporate owners of the StarTeam servers that there is no known way to do a complete migration of our current CVS repository to StarTea...

How to find number of lines changed between CVS versions?

I've spent most of the day making what are basically some housekeeping changes to the codebase of one of our projects (replacing all System.out.println() calls with log4j). I'm kind of curious how many lines of code I've updated with this set of changes. Is there anyway with cvs diff or another command to get an accurate count of how m...

How do I move a CVS repository from one server to another and maintain history?

I have a CVS repository on my local workstation. I've demonstrated to my employer that version control is a great idea. Alright! So now I want to migrate my CVS history from my local workstation onto a real server. I have installed CVS on the server and it is working. Now, can I just move my repository files? Or do I have to do some so...

Subversion vs CVS

Hi All, I've used both SVN and CVS a little bit, but will need to choose one for a new project I will be starting. Can anyone who has used both extensively please offer some pros and cons and which they think is better? Best learning resources would be appreciated too. This will be for a small project, just one or two developers to s...

How do I get a list of commit comments from CVS since last tagged version?

I have made a bunch of changes to a number of files in a project. Every commit (usually at the file level) was accompanied by a comment of what was changed. Is there a way to get a list from CVS of these comments on changes since the last tagged version? Bonus if I can do this via the eclipse CVS plugin. UPDATE: I'd love to accept an...

What Python bindings are there for CVS or SVN?

I once did a cursory search and found no good CVS bindings for Python. I wanted to be able to write helper scripts to do some fine-grained manipulation of the repository and projects in it. I had to resort to using popen and checking the stdout and stderr and then parsing those. It was messy and error-prone. Are there any good qualit...

Best way to make sure correct version of file is deployed?

The company I work for writes a lot smallish Perl and Bash scripts to massage data into something usable for our software. These scripts, like any code, can change. I provided them CVS because of the file versioning rather than repository versioning. Anyway, I am thinking out a deploy tool to get the scripts from development to produc...