RE: Comparison of two repositories?
-Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Sent: Wednesday, September 10, 2003 8:07 PM To: [EMAIL PROTECTED] Cc: CVS list Subject: Re: Comparison of two repositories? Mark D. Baushke writes: The '-x CVS' option tells GNU diff to exclude any CVS directories from the comparison. If you have lots of RCS keywords turned on, then you may wish to write a quick script that goes thru your diff output an elides any hunks that only contain differences in RCS keyword expansions. Or use the GNU diff -I option to ignore those lines in the first place. Is there a way to have them ignored as well in a regular cvs update -j ... -j ... operation? Michael ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Comparison of two repositories?
Lemke, Michael IZ/HZA-IE5 [EMAIL PROTECTED] writes: [EMAIL PROTECTED] writes: Mark D. Baushke writes: The '-x CVS' option tells GNU diff to exclude any CVS directories from the comparison. If you have lots of RCS keywords turned on, then you may wish to write a quick script that goes thru your diff output an elides any hunks that only contain differences in RCS keyword expansions. Or use the GNU diff -I option to ignore those lines in the first place. Is there a way to have them ignored as well in a regular cvs update -j ... -j ... operation? Ignored? Not entirely. The closest you can come is to add the -kk flag to the command: cvs update -kk -j... -j... After you have resolved your conflicts, use cvs update -kkv to restore the default values for your keywords. Good luck, -- Mark ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Merging multible branches
Merging multible branches. PROBLEM: I loose my merged branch changes if another branch is merged to the trunk afterward. QUESTION: How does CVS merge a branch, if multible branch points exists on the same trunk version. DESCRIPTION: I reproduced the problem like this: 1.1 | [Branch1]--- 1.2 ---[Branch2] | | | |1.3| | | | 1.2.2.1 ---1.4| | | 1.5--- 1.2.4.1 (minor change not included in 1.2.2.1) The merge of Branch1 results in: cvs update -P -jBranch1 tekst.txt (in directory C:\CVSsandbox_SCADA\testmodules\cso\Dir\) RCS file: /mitarepo/testmodules/cso/Dir/tekst.txt,v retrieving revision 1.2 retrieving revision 1.2.2.1 Merging differences between 1.2 and 1.2.2.1 into tekst.txt The merge of Branch2 results in: cvs update -P -jBranch2 tekst.txt (in directory C:\CVSsandbox_SCADA\testmodules\cso\Dir\) RCS file: /mitarepo/testmodules/cso/Dir/tekst.txt,v retrieving revision 1.2.2.1 retrieving revision 1.2.4.1 Merging differences between 1.2.2.1 and 1.2.4.1 into tekst.txt And now the changes made in 1.2.2.1 and merged into 1.4, is removed in this last merge. How can that happen?? I have always believed that ONLY changes in the branch is merged. But the output of the merge command for Branch2 indicates that a diff is beeing made between the two branches, and this diff is merged into the trunk (Now I loose my changes made in Branch1)??? Med venlig hilsen / Yours sincerely / Mit freundlichen Grüssen Christian Schultz Ottosen Software Developer M.Sc.E.E. E-mail: [EMAIL PROTECTED] MITA-TEKNIK A/S Håndværkervej 1 8840 Rødkærsbro Denmark Tel: +45 86 65 86 00 Fax: +45 86 65 92 90 www.mita-teknik.com ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Merge-Problem: nonmergeable file needs merge
Hi there, during a merge (from branch to HEAD) I got the following error message (concerns a lot of files): --- ... cvs server: PositionOffset.xml: permission mismatch between 1.1 and 1.1.2.1 cvs server: nonmergeable file needs merge cvs server: revision 1.1.2.1 from repository is now in config/scan/PositionOffset.xml cvs server: file from working directory is now in .#PositionOffset.xml.1.1 C config/scan/PositionOffset.xml ... Where does this message come from? My first thought was: the original file was write-protected before merge - but this wasn't true (In a second merge-attempt I recursively removed all write-protection flags before merge, but the effect was the same) Perhaps it might have to do with some cvs edit/ cvs unedit actions I performed with CVS on the files. Any idea when this message occurs - and what to do to avoid it? Thanks Johannes -- COMPUTERBILD 15/03: Premium-e-mail-Dienste im Test -- 1. GMX TopMail - Platz 1 und Testsieger! 2. GMX ProMail - Platz 2 und Preis-Qualitätssieger! 3. Arcor - 4. web.de - 5. T-Online - 6. freenet.de - 7. daybyday - 8. e-Post ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
FW: Mac CVS Error.
Hi Guys, Can somebody suggest me solution to this problem or the forum where I can put this query ... Thanx in anticipation . Regards, Pervinder Singh Sudan -Original Message- From: Pervinder Singh Sudan Sent: Thursday, September 11, 2003 6:11 PM To: '[EMAIL PROTECTED]' Subject: Mac CVS Error. Hi Guys, I have been running the MacCVS client 3.2b14 on MacOS X 10.2.6 (on a Dual Processor MAC). While chedcking out a specific module from the CVS Server running on a Linux Server I am getting the following error: cvsgui [checkout aborted]: Internal error: cvs_hqx.cpp, 635: Unknown error: 4294967257 If I update that specific folder it's done successfully but if I do a cleanget It throws n error. Look forward to the any help on this. Regards, Pervinder Singh ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: cvs log problem
Sorry to spam everyone. After a detailed investigation I found the log message works correctly using cvs 1.11.5, but I also found that I cannot use log to identify all changes between two tags. I am trying to identify All changes by using -- cvs log -rus-1-0-9-78::us-1-0-9-80 -- I have determined that cvs lists all modifications between the two tags, but will not list additions or deletions. It appears that a file must have both tags or it is ignored. I guess that it makes sense -- it is hard to list what is between if you only have one end. Does anyone know how to identify ALL changes between two tags? Larry Lords I just upgraded by windows system from CVSNT 2.0.4(?) to cvs 1.11.5 and the log appears to be working correctly now. I will do some more detail checking, but it looks good. Larry Lords +++ I am seeing some of the same problems. There are times it seems to work, and other times I just get the root directory files. Is there a way of getting the latest version for a window's cvs client without downloading the source and building it from scratch? I believe it is my CVSNT client that could be some of the problem. Thanks for your help, Larry Lords [EMAIL PROTECTED] 09/10/03 12:14PM Ralph Jocham writes: When I add the -S option I only get the files I modified listed, which is good. However, I also only get those in the root directory of the module (i.e. not in the subdirectories), which is bad. There is nothing in the -S option that prevents recursion -- if you're not seeing any files in subdirectories, it's because there aren't any selected revisions in any of them. Run the command without the -S and see what selected revisions: is for those files. If it's not zero and you still don't see those files when you add -S, try upgrading to the latest release of CVS (1.11.6) on both the client and the server. If that still doesn't help, let us know. -Larry Jones What's the matter? Don't you trust your own kid?! -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs -- This message may contain confidential information, and is intended only for the use of the individual(s) to whom it is addressed. == ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Deleting tag.
[EMAIL PROTECTED] writes: Can any one please explain the behavior for the following tag deletion and checkout: I don't see anything strange about deleting the tag so I assume it's the checkout that has you confused. Although the tag was deleted, it still exists in the CVSROOT/val-tags file and thus is considered valid, so you don't get an error but you also don't get any files because the tag doesn't exist in any of them. -Larry Jones Bad news, Mom. I promised my soul to the Devil this afternoon. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Merging multible branches
Christian Schultz Ottosen writes: The merge of Branch2 results in: cvs update -P -jBranch2 tekst.txt (in directory C:\CVSsandbox_SCADA\testmodules\cso\Dir\) RCS file: /mitarepo/testmodules/cso/Dir/tekst.txt,v retrieving revision 1.2.2.1 retrieving revision 1.2.4.1 Merging differences between 1.2.2.1 and 1.2.4.1 into tekst.txt If Branch2 were rooted where you think it is, the first revision retrieved would have been 1.2, not 1.2.2.1. Can you do a status -v on the file and post the results? -Larry Jones He's just jealous because I accomplish so much more than he does. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: FW: Mac CVS Error.
Pervinder Singh Sudan writes: Can somebody suggest me solution to this problem or the forum where I can put this query ... I think you want the CvsGui mailing list: http://groups.yahoo.com/group/cvsgui/ -Larry Jones Santa's gonna skip this block for years. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Control boilerplate for log messages
Dickson, Craig writes: This message is in MIME format. Since your mail reader does not understand this format, some or all of this message may not be legible. Please do not send MIME and/or HTML encrypted messages to the list. Plain text only, PLEASE! However when I go to commit my changes from the command line, in the editor window that pops up (Notepad), there is my template, but also the original boilerplate that appeared before when I didn't have a template (the one with the CVS: prefix on each line). I have a couple of questions: 1. Is there a way to remove this boiler plate text? No. 2. Or if not, can I control what it says? No. 3. Can I use the same line prefix technique in my own template? Yes. 4. Lastly can I make my template appear below the boilerplate in the editor instead of above it? No. (No is shorthand for Not without changing the code.) -Larry Jones Who, ME? Who?! Me?? WHO... Me?! Who, me??? -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: FW: Mac CVS Error.
Hi Guys, Can somebody suggest me solution to this problem or the forum where I can put this query ... Thanx in anticipation . Try the cvsgui mailing list: http://groups.yahoo.com/subscribe/cvsgui or look at docs here: http://www.wincvs.org/ HTH, Geoff ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
CVS history and tag vs rtag
Hi all, I have a question regarding the entries added to the CVS history file for tag operations. The documentation clearly states that only a rtag operation (and not the normal tag) operation writes a history entry. Could someone in the know tell me why this decision was made. It seems very strange to me to exclude norrmal tag operations, whilst at the same time logging checkouts which do not affect the repository state [I know this can be turned off if desired] Thanks, Martin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Merge-Problem: nonmergeable file needs merge
Johannes Kilian writes: cvs server: PositionOffset.xml: permission mismatch between 1.1 and 1.1.2.1 This indicates that you have enabled the notoriously buggy PreservePermissions code. Since that has been disabled in recent releases of CVS, you must either be using a very old release of CVS or you have gone out of your way to enable it. I strongly suggest upgrading to the current release of CVS or at least disabling it in your CVSROOT/config file. When PreservePermissions is enabled, CVS stores the permissions along with each revision. In this case, it is telling you that revision 1.1.2.1 had different permissions than revision 1.1. -Larry Jones I don't NEED to compromise my principles, because they don't have the slightest bearing on what happens to me anyway. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: cvs log problem
From: Larry Lords [mailto:[EMAIL PROTECTED] Sent: Thursday, September 11, 2003 9:04 AM To: [EMAIL PROTECTED] Subject: Re: cvs log problem Does anyone know how to identify ALL changes between two tags? Larry Lords cvs rdiff -s -rtag1 -rtag2 module This will give results such as the following: File alpha/OTS/fcs/CHFSFR.OTS changed from revision 1.6 to 1.9 File alpha/OTS/fcs/METTE4.OTS is removed; not included in release tag ver_20030318 File alpha/OTS/static/TMP315.DAT is new; current revision 1.1 Dale Miller ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
updated to 1.11.6 (from 1.11.2) now have problems on windows
I'm running the cygwin 1.11.5 client on Windows 2k sp4. Got this when I updated today on Windows, after upgrading to 1.11.6 yesterday on the linux RH server (2.4.22 kernel): D:\acl7\src\clcvs update -d cvs server: Updating . P ChangeLog cvs update: move away ./Makefile; it is in the way C Makefile P makedist.cl cvs server: Updating addcaps ... cvs server: Updating orblink P orblink/ChangeLog P orblink/Makefile cvs server: Updating orblink/CC cvs server: Updating orblink/CC/lib cvs server: Updating orblink/doc cvs [server aborted]: CHANGE-LOG,v is ambiguous; could mean CHANGE-LOG,v or change-log,v D:\acl7\src\clcvs --version Concurrent Versions System (CVS) 1.11.5 (client/server) Copyright (c) 1989-2002 Brian Berliner, david d `zoo' zuhn, Jeff Polk, and other authors CVS may be copied only under the terms of the GNU General Public License, a copy of which can be found with the CVS distribution kit. Specify the --help option for further information about CVS D:\acl7\src\cl CVS/Entries on the Windows box has: /makefile/1.35.2.1/Thu Jul 10 21:16:25 2003//Tlayer46 And in the filesystem on the Windows box: D:\acl7\src\cldir | grep makefile 07/10/2003 02:16p 13,424 makefile 07/07/2003 03:44p 2,527 makefile.defs 07/09/2002 03:36p 42 makefile.top D:\acl7\src\cl A fresh checkout of the module on windows yields this: cvs -Q checkout -r layer46 cl cvs checkout: move away cl/makefile; it is in the way ... Files in my repository: quadra% ls -l Makefile* makefile* Attic/Makefile* Attic/makefile* -r--r--r--1 layerfi 9127 Dec 17 1997 Attic/Makefile.old,v -r--r--r--1 layerfi 20231 May 23 1997 Attic/Makefile,v -r--r--r--1 layerfi 30475 Jul 25 13:21 makefile.defs,v -r--r--r--1 layerfi 111306 Jul 25 13:21 makefile,v quadra% The Attic version of `Makefile' was cvs removed years ago (on the trunk and all currently used branches). This has never been a problem before. Bug? Workaround? ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: updated to 1.11.6 (from 1.11.2) now have problems on windows
I'm running the cygwin 1.11.5 client on Windows 2k sp4. Btw, upgrading cygwin, which contaains 1.11.6, does not fix the problem. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: updated to 1.11.6 (from 1.11.2) now have problems on windows
Kevin Layer writes: cvs [server aborted]: CHANGE-LOG,v is ambiguous; could mean CHANGE-LOG,v or change-log,v CVS was designed for case-sensitive file systems and has never quite worked entirely correctly on case-insensitive file systems. Client/ server mode where one system is case sensitive and the other is not is even more problematic. CVS 1.11.6 generally complains about the situation rather than quietly doing what may be the wrong thing. Unfortunately, once you've gotten yourself into this mess, there's no good way out. The only solution is to rename one of the files in the repository so the names don't clash, but that means that checking out an old version doesn't really give you the old version. -Larry Jones He's just jealous because I accomplish so much more than he does. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: updated to 1.11.6 (from 1.11.2) now have problems on windows
Lots of instances of the following in my repository: foo,v Attic/Foo,v where the Attic file was cvs rm'd years ago and is not used anymore. If I rename Attic/Foo,v to Attic/Foo_renamed_due_to_cvs_bug,v and cvs update -d on my Windows box, all is well. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: CVS history and tag vs rtag
On Thu, Sep 11, 2003 at 05:30:22PM +0200, Martin FUZZEY wrote: The documentation clearly states that only a rtag operation (and not the normal tag) operation writes a history entry. These threads from the list archives are of particular interest: http://mail.gnu.org/archive/html/info-cvs/2001-08/msg01156.html http://mail.gnu.org/archive/html/info-cvs/2000-11/msg00404.html -- | | /\ |-_|/ Eric Siegerman, Toronto, Ont.[EMAIL PROTECTED] | | / When I came back around from the dark side, there in front of me would be the landing area where the crew was, and the Earth, all in the view of my window. I couldn't help but think that there in front of me was all of humanity, except me. - Michael Collins, Apollo 11 Command Module Pilot ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Exclusionary checkout?
We have been working on revising an archaic workflow, and a question came up which I could not resolve with my 6 years of CVS experience. Would it be possible to pull a set of files from the repository in a _NEGATIVE_ sense? That is, I want all the files that do NOT have tag X-Y-Z. = Mark Jaffe| (408) 972-9638 (home) Chief Wizard | (408) 807-1530 (cell) Computer Wizards | (425) 795-6421 (FAX) ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
trouble getting cvs history
All, I'm having trouble getting cvs history for a module in our repository. Specifically, cvs history -n modulename -D Thursday returns = No records selected. If I run cvs history -n modulename or cvs history -on modulename without the date stamp, I get information that I checked out the module 4-30-03 (this is the first time I ever checked this module out), when in reality, I checked it out again today. I am able to use it to display individual file history info, no problem at all, but I really would like to get info regarding the date that users checked out the entire modules last. many thx in advance. I have plowed through the CVS docs and some other CVS sites http://www.loria.fr/%7emolli/fom-serve/cache/155.html http://www.durak.org/cvswebsites/doc/cvs_118.php#SEC118 but couldn't get the info I needed. Any help is appreciated. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
