If the stuff you were rolling out was bad/broken then you _may_ not want any of the other developers to build on that source. By committing the current (sandbox you ran `cvs update -jDEV_1_32 -jDEV_1
I'm in the working directory for branch build-15-va. I want to merge the new helpers/DocAbstractValidateHandler.java directory/file that was introduced on the trunk between build-15 (the GCA) and bui
Hi, I can not make my branch check in work correctly with rtag. I has a module called sample with has four files: sample/Makefile sample/f1.c sample/foo.c sample/main.c. Under directory: /home/yzhang
Hi, I can not make my branch check in work correctly with rtag. I has a module called sample with has four files: sample/Makefile sample/f1.c sample/foo.c sample/main.c. Under directory: /home/yzhang
Sure: back out the change, create the branch, then redo the change on the branch. For example, assuming the revision in question in 1.27: cvs up -j1.27 -j1.26 file # back out unwanted change cvs ci #
Hi I am having trouble creating a branch on a project that already has a vendor branch. At least the results seem strange to me. I am importing an open source project (GMOD) as a vendor branch. I cha
cvs update -j2.1 -jRoot-of-Branch cvs commit should get the mainline text to be what it was before your problem commit... assuming that Root-of-Branch was still the top-of-tree version prior to your
Can you give me some information about the "commit ids" features functionality and when it will be released? I'm also looking for some 'functional' grouping. We are working with softwarereleases whic
I followed this discussion only loosely and kept silent because I suspect someone will shoot me to pieces for the complaint I'm about to make, but now that we're to the stage of actual implementation
Hi When I tried to execute the following command cvs log -Nb -r -d >2005-03-22 CentrexMateWeb I am getting the following error.. cvs [log aborted]: Can't parse date/time: CentrexMateWeb What may be i
Ah, gotcha. I'm wondering if it might be easier to modify viewCVS to handle 2 digit dates safely. I doubt that CVS uses the timestamp - there are operations that can change the timestamp of the file,
If you want to use a fake email addr, it would be much friendlier to have it at a domain that resolves. example.com might be a good choice... Many MTAs reject unresolvable domains, others just whine
So far, so good. Side note: if you never made changes on your trunk, you're ok. If you ever committed changes to 1.11.17 on your trunk, you need to perform a merge, as in https://www.cvshome.org/docs
Mak, The rdiff -s argument using two dates or two tags gives you good information. It shows what files have changed, are new, or removed (in attic) with revision numbers. cvs -Q rdiff -s -Dyyyymmdd -
Mark, you understand the problem perfectly. It's not possible to have a plug-in merge tool unless there's a guarantee that all of the possible combinations of data fed to it are compatible. CVS does
Hi Greg, It is a pity that you didn't bother to read what I wrote and instead ranted on a question that was not asked. Have you been ill? If so, I am sorry to hear it, please get well soon. Let me pu
Nobody has suggested abandoning diff for computing RCS deltas. All discussion relating to replacement of diff and merge tools have revolved around the user interface. That's completely different. Yo
Hi, Run this python script from within a checked out sandbox. It will create a file called table.txt. Load this file into excel and use PivotTables to get statistics. (This is called DataPilot in Ope
Barry, Try cvs -q rdiff -s -r oldrev -r newrev module Note that the -s option is available on rdiff and not on diff Usage: cvs rdiff [-flR] [-c|-u] [-s|-t] [-V %d] -r rev|-D date [-r rev2 | -D date2]