I currently use RCS' merge command to do 3-way merges, but one thing has always annoyed me about it. If I use the -A option, the same change made in both files shows up as a conflict: <<<<<<< file1 file1 line 1 ||||||| orig orig line 1 ======= file2 line 1 >>>>>>> file2 orig line 2 <<<<<<< orig ======= line added in both changes >>>>>>>...
I am using SVN for development tasks, but still have many files managed with RCS, because it does not seem reasonable to edit them in my private SVN repository working copy (since they're often just configuration files that are also best tested in-place). It also doesn't seem reasonable to have a working copy of the repository wherever t...
Hello I am working with a simulator that uses rcS scripts to boot, this is my script cd /tests ./test1 & ./test2 & ./test3 & ./test4 exit What I want is run all the test at the same time and that the exit command is executed only when all the previous test have finished. And not only when test 4 has finished, is this possible?. Thank...
Before I begin: I have spent a long time on many forums (including Stack Overflow - and yes there are a lot of SO questions on organizing svn), searching Google, and reading documents (I own a few Subversion books). I still have not found a good way to organize our code base in Subversion. We currently use RCS as our revision control s...
I am looking for a way to join two revision histories for a single file. One of our projects was tracked via RCS. Now, this project lives in CVS. It was initially committed as a new project. As a result, the CVS history does not show the older revisions that were tracked via RCS. For example, suppose file foo.c was revised 10 times ...
Does RCS have something like svn/p4 delete where it keeps the file history but marks it as deleted? Or do I just remove the file and the matching v file in the RCS directory? What's the recommended way of removing and/or moving files with RCS? ...
I am working with a c++ codebase using rcs repository (agh, old I know), during major code changes, I modify a lot of files, which I sometimes lose track of. So I would like to have a small script which will list the files that are different (those that I changed) from files in the repository. It is sort of unrealistic to do rcsdiff on...
I have a 20-year-old project that I would like to migrate from RCS to git, without losing the history. All web pages suggest that the One True Path is through CVS. But after an hour of Googling and trying different scripts, I have yet to find anything that successfully converts my RCS project tree to CVS. I'm hoping the good people at...
I have to store two files A and B which are both very large (like 100GB). However B is likely to be similar in big parts to A so i could store A and diff(A, B). There are two interesting aspects to this problem: The files are too big to be analyzed by any diff library I know of because they are in-memory I don't actually need a diff - ...
I commited (not pushed) a lot of files locally (including binary files removing & adding...) and now when I try to push it takes a lot of time. Actually I messed up my local repo history. How could I avoid this mistake in the future ? Can I transform a set of local revision 1->2->3->4 to 1->2 with 2 being the final revision of the local...
Using cvs, git or another technique (file system level?), I would like to: Make modifications on branch A Checkout branch B: Changes to branch A are "stowed away" (by name would be nice), branch B is checked out such that my branch A changes are gone Make modifications on branch B Checkout branch A: Changes to branch B are "stowed away...
Hi, i am using subversion as RCS. Always when a new version of my project is finised i create a tag of it (copy of the trunk). Does anybody know how i can protect this tagged directory from being accidentally modified? At the moment as a workaround i lock all files. But this sill means that the user with the lock can edit the files. I...
Perforce supports various RCS keywords including $file$ and $version$. Is there a way to add a custom RCS keyword? I want to create a custom keyword so that when the file is checked in, Perforce will replace the keyword with a custom string. e.g. from: $customString$ to: This is a custom message ...
Hi everyone, I've been tasked to build up a subversion system for dev/test/prod environments, and was wondering if anyone has any experience with a similar environment or suggestions. We build and configure a number of systems that are a combination of scripts and complex configuration files for 3rd party products. Due to this, it is im...
I've been using ComponentSoftware's CS-RCS Basic for many years now to manage my various single-developer projects. It's worked very well for me, but now I want to migrate to a modern revision-control system, and after studying my options I decided on Mercurial. The problem is that I've always used a central repository for CS-RCS, and I...