cvs-1.11.10 win32 VC98 cannot find "assert" during build
The following command builds cvs-1.11.9, but not cvs-1.11.10 under
windows:
nmake /f cvsnt.mak CFG="cvsnt - Win32 Debug"
The failure appears to be:
link.exe @c:\temp\nma01012.
filesubr.obj : error LNK2001: unresolved external symbol _assert
.\WinDebug/cvs.exe : fatal error LNK1120: 1 unresolved externals
NMAKE : fatal error U1077: 'link.exe' : return code '0x460'
Stop.
There is related information about "assert" earlier in the build
log:
cl.exe /nologo /MLd /W3 /Gm /GX /Zi /Ob1 /I "windows-NT" /I
"lib" /I "src" /I "zlib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D
"HAVE_CONFIG_H" /Fp".\WinDebug/cvsnt.pch" /YX /Fo".\WinDebug/"
/Fd".\WinDebug/" /c ".\windows-NT\filesubr.c"
filesubr.c
.\windows-NT\filesubr.c(766) : warning C4013: 'assert' undefined;
assuming extern returning int
My compiler is Microsoft Visual Studio / VC98.
I don't know much about building on windows, not sure what else
to provide, so here is the seemingly related source code change:
windows-NT$ cvs diff -rcvs_1_11_9 -rcvs_1_11_10 filesubr.c
Index: filesubr.c
===
RCS file: /users/home/tibco/tibadmin/cvs/cvs/windows-NT/filesubr.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.2
diff -r1.1.1.1 -r1.1.1.2
743a744,782
> /* char *
> * xresolvepath ( const char *path )
> *
> * Like xreadlink(), but resolve all links in a path.
> *
> * INPUTS
> * path The original path.
> *
> * RETURNS
> * The path with any symbolic links expanded.
> *
> * ERRORS
> * This function exits with a fatal error if it fails to read the link for
> * any reason.
> */
> char *
> xresolvepath ( path )
> const char *path;
> {
> char *hardpath;
> char *owd;
>
> assert ( isdir ( path ) );
>
> /* FIXME - If HAVE_READLINK is defined, we should probably walk the path
> * bit by bit calling xreadlink().
> */
>
> owd = xgetwd();
> if ( CVS_CHDIR ( path ) < 0)
> error ( 1, errno, "cannot chdir to %s", path );
> if ( ( hardpath = xgetwd() ) == NULL )
> error (1, errno, "cannot readlink %s", hardpath);
> if ( CVS_CHDIR ( owd ) < 0)
> error ( 1, errno, "cannot chdir to %s", owd );
> free (owd);
> return hardpath;
> }
>
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
pretty printer on commit
I would like to run all commits of .h and .cc files through a pretty printer to automatically assist in later merges and conformance to style. I'm running a pserver. Are there any tips I should know of how to do this before trying? Thanks, Dave. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: cvs-1.11.7 seems to have changed the api for "release"
On Thu, Oct 02, 2003 at 03:32:43PM MDT, Derek Robert Price wrote: > ~From the NEWS file: > > | Changes from 1.11.6 to 1.11.7: > > > . . . > > | * The global '-l' option, which suppressed history logging, has been > removed > | from both client and server. DOH!! I read that but didn't put two and two together...thanks for helping me throught my brain problems. :) ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
cvs-1.11.7 seems to have changed the api for "release"
Using pserver cvs-1.11.7 on solaris and client cvs-1.11.6 for aix, hpux, or solaris, there is this problem which does not occur when the client and server are the same version: cvs release -d example Protocol error: bad global option -l cvs release: unable to release `example' Thanks, Dave. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
[lawrence.jones@eds.com: Re: Stable CVS 1.11.7 Released! (Derek Robert Price)]
Thanks Larry! This fixed it.
--- Begin Message ---
David Everly writes:
>
> All three have the same behavior of showing the password (which was
> not present with 1.11.6). Output of "uname -a":
>
>AIX chanegw0 3 4 000110554C00
>SunOS ndccsr02 5.8 Generic_108528-19 sun4u sparc SUNW,Ultra-Enterprise
>HP-UX chanhp9 B.11.11 U 9000/800 1877750441 unlimited-user license
By golly, so they do. The GNULIB version of getpass is defective, but
it doesn't show up on my BSD-derived system nor, presumably, on Linux.
Since passwords are read directly from the terminal, it's not tested in
the nightly testing. I've checked in a fix and I'll be sending it on to
the GNULIB folks. Here's a patch for anyone that wants it:
Index: getpass.c
===
RCS file: /cvs/ccvs/lib/getpass.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- getpass.c 29 Jul 2003 13:37:37 - 1.1.2.1
+++ getpass.c 30 Sep 2003 22:11:51 - 1.1.2.2
@@ -20,6 +20,9 @@
#endif
#include
+#ifndef SEEK_CUR
+#define SEEK_CUR 1
+#endif
#include
#include
#include "getline.h"
@@ -83,8 +86,11 @@
/* Remove the newline. */
buf[nread - 1] = '\0';
if (tty_changed)
- /* Write the newline that was not echoed. */
- putc ('\n', out);
+ {
+ /* Write the newline that was not echoed. */
+ if (out == in) fseek (out, 0, SEEK_CUR);
+ putc ('\n', out);
+ }
}
}
-Larry Jones
I sure like summer vacation. -- Calvin
--- End Message ---
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Stable CVS 1.11.7 Released! (Derek Robert Price)
On Tue, Sep 30, 2003 at 03:10:08PM MDT, Larry Jones wrote: > David Everly writes: > > > > (Password is not displayed while typing it, but is displayed after > > pressing the ENTER key.) > > On what platform? > > -Larry Jones All three have the same behavior of showing the password (which was not present with 1.11.6). Output of "uname -a": AIX chanegw0 3 4 000110554C00 SunOS ndccsr02 5.8 Generic_108528-19 sun4u sparc SUNW,Ultra-Enterprise HP-UX chanhp9 B.11.11 U 9000/800 1877750441 unlimited-user license Configure parameters: ./configure --prefix=/opt/cvs-1.11.7 --without-krb4 --without-gssapi I am assuming this has something to do with the new internal getpass function...but not sure what. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: Stable CVS 1.11.7 Released! (Derek Robert Price)
Under cvs-1.11.7, the password is displayed on the client screen as follows: cvs login (Password is not displayed while typing it, but is displayed after pressing the ENTER key.) I know pserver in general is not very secure, but is there any way to have a patch or fix that might eliminate this display? Thanks, Dave. -- http://agilemanifesto.org/principles.html () ascii ribbon campaign - against html mail /\- against proprietary attachments For assistance, see: http://www.expita.com/nomime.html ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: cvs windows 2000 case sensitivity issue
On Tue, Mar 25, 2003 at 10:21:55AM MST, Brian G. Peterson wrote: > If your Windows 2000 client is using FAT or FAT32 as the filesystem, then > no, because the internal representation of the filename is case insensitive, > and stored as all upper. If the filesystem is NTFS, it should work. The windows client is on NTFS (just re-verified to be sure), but I am still having the problem. > > I do a lot of cross-platform development, and Unix development using Windows > clients. It try to use all lower for directory names especially, as this > type of issue crops up regularly. It seems to be less of a problem with > filenames. I agree with this policy recommendation. > > - Brian > > > Our cvs pserver is on Solaris. A cvs client is on windows 2000. > > We are using the latest version for both server and client. > > > > Initially, we had a directory in all uppercase (SOMEDIRECTORY). We > > did cvs remove -f of all the files in that directory followed by cvs > > commit. Then we made a different directory (SomeDirectory), copied > > files into that directory, then did cvs add SomeDirectory, cvs add of > > the files inside that directory, followed by cvs commit. > > > > Unfortunately on the windows client, we now get SOMEDIRECTORY filled > > with files when doing cvs checkout of the module containing > > SOMEDIRECTORY. > > > > The .cvsrc file on the client contains: > > > > cvs -q -z3 > > tag -c > > update -P -d > > checkout -P > > > > For historical reasons, we would like to keep both directory names > > (SOMEDIRECTORY for previous releases, SomeDirectory for current and > > future releases). > > > > This seems to be possible on a Unix client, but is it possible in a > > windows client, where we don't need to have the two directories > > existing simultaneously? > > > > Thanks, > > Dave. > > > > > > > > ___ > > Info-cvs mailing list > > [EMAIL PROTECTED] > > http://mail.gnu.org/mailman/listinfo/info-cvs > > > > -- [EMAIL PROTECTED] V-Net: 622-3286 Phone: 1-719-535-3286 Pager: 1-800-724-3624 # 140-1311 - We must get back to basics and drive operational excellence. - We must drive profitable sales and accelerate new product introductions. - We must reduce structural costs and deliver a Plan of Reorganization. - We must rebuild the organization based on accountability, teamwork and trust. --Michael Capellas () ascii ribbon campaign - against html mail /\- against proprietary attachments For assistance, see: http://www.expita.com/nomime.html ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
cvs windows 2000 case sensitivity issue
Our cvs pserver is on Solaris. A cvs client is on windows 2000. We are using the latest version for both server and client. Initially, we had a directory in all uppercase (SOMEDIRECTORY). We did cvs remove -f of all the files in that directory followed by cvs commit. Then we made a different directory (SomeDirectory), copied files into that directory, then did cvs add SomeDirectory, cvs add of the files inside that directory, followed by cvs commit. Unfortunately on the windows client, we now get SOMEDIRECTORY filled with files when doing cvs checkout of the module containing SOMEDIRECTORY. The .cvsrc file on the client contains: cvs -q -z3 tag -c update -P -d checkout -P For historical reasons, we would like to keep both directory names (SOMEDIRECTORY for previous releases, SomeDirectory for current and future releases). This seems to be possible on a Unix client, but is it possible in a windows client, where we don't need to have the two directories existing simultaneously? Thanks, Dave. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: connection using pserver
On Fri, Jan 17, 2003 at 10:03:06AM MST, [EMAIL PROTECTED] wrote: > Do users connecting using the pserver method need a real account (shell > login, home directory,...) on the machine running cvs pserver? No, search for "passwd" in the following: http://www.cvshome.org/docs/manual/cvs_2.html ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Info-cvs Digest, Vol 2, Issue 29
On Fri, Jan 17, 2003 at 10:03:06AM MST, [EMAIL PROTECTED] wrote: > Do users connecting using the pserver method need a real account (shell > login, home directory,...) on the machine running cvs pserver? No, search for "passwd" in the following: http://www.cvshome.org/docs/manual/cvs_2.html ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: CVS Server step-by-step?
On Wed, Jan 15, 2003 at 10:04:43AM MST, [EMAIL PROTECTED] wrote: > From: "Markel, Ryan" <[EMAIL PROTECTED]> > Subject: CVS Server step-by-step? > > I'm trying to set up a repository currently on our school's Debian 3.0r1 = > box, > which currently has the Debian packacge for CVS 1.11.1p1 installed. > > All I want to do is set up the server so I can receive WinCVS client > connections from both on and off-campus, and I was hoping to find simple > documentation on this process - but three of us have been looking around = > for > most of the morning and haven't found squat in the way of concise, > easy-to-understand documentation on the process. Others have provided the documentation on this. I should point out that Debian has a utility that can help automate the server setup. Just run the following as root: dpkg-reconfigure cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
knowledge of binary designation in cvswrappers for commitinfo script
My developers sometimes ftp text files as binary from windows to a unix machine and then commit these files to cvs. I have these files defined in cvswrappers as: -k 'o' Some other files are defined in cvswrappers as: -k 'b' In my commitinfo script, how do I discover if the file is marked -k 'o' so I can run dos2unix on it before the commit? ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: cvs tag -c
No, thank you. :) On Wed, Jun 26, 2002 at 04:21:11PM -0400, Larry Jones wrote: > David Everly writes: > > > >cvs tag -c MY_TAG > >cvs server: someFile is no longer in the repository > >cvs server: someFile is locally modified > >cvs [server aborted]: correct the above errors first! > > I've checked in a fix for this bug. Thanks! > > -Larry Jones > > It's going to be a long year. -- Calvin -- [EMAIL PROTECTED] V-Net: 622-3286 Phone: 1-719-535-3286 Pager: 1-800-724-3624 # 140-1311 The significant problems we face cannot be solved at the same level of thinking we were at when we created them. --Albert Einstein ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
cvs tag -c
It seems to me that I'm getting unexpected behavior in the following scenario (in order of occurance): me in my workspace: cvs commit -m "commit of everything in my workspace" someone else in a different workspace: cvs remove -f someFile cvs commit -m "removing someFile from the repository" me in my workspace: cvs tag -c MY_TAG cvs server: someFile is no longer in the repository cvs server: someFile is locally modified cvs [server aborted]: correct the above errors first! I was expecting that since I did in fact commit, that 'tag -c' would allow me to tag based on my committed workspace. I am using Concurrent Versions System (CVS) 1.11.1p1 (client/server) on Solaris 8. Is this a bug or something that I am not understanding? ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: pserver client and server on same machine
No issues beyond the ones documented at: http://www.cvshome.org/docs/manual/ specifically: http://www.cvshome.org/docs/manual/cvs_2.html#SEC29 On Mon, Apr 22, 2002 at 02:55:49PM -0400, Matt Riechers wrote: > David Everly wrote: > > > > Does using a "pserver unix client" which access the "pserver unix server" > > on the same machine as the client cause any problems other than those > > which are normally encountered using "pserver unix client" to access > > the "pserver unix server" on a remote machine? > > What problems do you "normally" encounter using pserver? > > -Matt -- [EMAIL PROTECTED] V-Net: 622-3286 Phone: 1-719-535-3286 Pager: 1-800-724-3624 # 140-1311 ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
pserver client and server on same machine
Does using a "pserver unix client" which access the "pserver unix server" on the same machine as the client cause any problems other than those which are normally encountered using "pserver unix client" to access the "pserver unix server" on a remote machine? -- [EMAIL PROTECTED] V-Net: 622-3286 Phone: 1-719-535-3286 Pager: 1-800-724-3624 # 140-1311 ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
preventing direct repository changes
Is there some technique I can use to prevent my developers from directly altering the cvs repository and force them to use cvs commands instead? ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: branch merging tactics (lock repository or not?)
On Thu, Feb 28, 2002 at 02:22:13PM -0800, Paul Sander wrote: > In other words, others have committed to your target branch before you > finished resolving conflicts and committed your work, right? > Yes. > What exactly do you want to do in that situation? Do you want to update > to the top of the branch before committing, or do you want to commit first? > You can't commit without being up to date, which means either updating or > branching again. The method you choose depends on the perceived risk of > lost work while performing the second update, and the likelihood of still > more commits during the second update. I think I want to "commit first". Some are uncomfortable with the merge process and having a "before" and "after" set of merge tags, we can back out of any merge and see if it was the merge that caused some problem, or just normal commits that are causing the problem. (We want our cake too). > This raises the issue of a race condition that is inherent in the > concurrent development model, where you may have to ask your colleagues > to hold their breath long enough for you to catch up and commit your > work. Yes, this was my thinking. > >--- Forwarded mail from [EMAIL PROTECTED] > > >How do I commit a large number of changes (generated by a merge) to > >the branch I'm merging to when there are several commits to that > >branch while I'm in the process of merging? And if I do update before > >commiting the merge (to bring in the new changes so that I'm allowed > >to check in) is there a way to have distinct "before merge" and "after > >merge" tags (that do not include "during merge" commits? > > >On Thu, Feb 28, 2002 at 01:22:04PM -0800, Paul Sander wrote: > >> What is the reason for locking the repository? Normally, it's to avoid > >> race conditions, e.g. when a commit is done on one of the branches involved > >> in the merge. > >> > >> You can avoid locking if you know the version numbers of the contributors > >> beforehand, or can otherwise identify them uniquely (e.g. with tags or > >> timestamps). So, consider this: > >> > >> Apply a tag to the top of the contributor branch before commencing the > >> merge. (I think rtag works with branch and timestamps, or you can check it > >> out and apply the tag to the sandbox and then release the sandbox.) Then > >> use "cvs update" with the appropriate number of -j options to perform the > >> merge, using the tagged contributors. > >> > >> A second benefit to creating a contributor tag is that you can use it as > >> the common ancestor tag for future 3-way merges, which reduces the number > >> of conflicts you must resolve by hand. > >> > >> >--- Forwarded mail from [EMAIL PROTECTED] > >> > >> >We currently have 3 active development branches as well as our trunk. > >> >Our trunk holds our next major release. Branches A, B, and C hold our > >> >next three major releases (in that order). About once a week, we merge > >> >the incremental changes (since the last merge) from the trunk, to branch > >> >A, then from branch A to branch B, then from branch B to branch C. We > >> >also have bug fix branches for releases currently in production, and if > >> >one of them has a new release on it, we merge (or consider merging) > >> >these changes into the trunk. > >> > >> >I have been locking the repository while we do these merges, but some > >> >developers are complaining. > >> > >> >Is it a good or bad practice to lock while merging branches. If we do > >> >not lock the repository while merging branches, what would be the > >> >potential result? > >> > >> >--- End of forwarded message from [EMAIL PROTECTED] > > >--- End of forwarded message from [EMAIL PROTECTED] > -- [EMAIL PROTECTED] V-Net: 622-3286 Phone: 1-719-535-3286 Pager: 1-800-724-3624 # 140-1311 ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: branch merging tactics (lock repository or not?)
How do I commit a large number of changes (generated by a merge) to the branch I'm merging to when there are several commits to that branch while I'm in the process of merging? And if I do update before commiting the merge (to bring in the new changes so that I'm allowed to check in) is there a way to have distinct "before merge" and "after merge" tags (that do not include "during merge" commits? On Thu, Feb 28, 2002 at 01:22:04PM -0800, Paul Sander wrote: > What is the reason for locking the repository? Normally, it's to avoid > race conditions, e.g. when a commit is done on one of the branches involved > in the merge. > > You can avoid locking if you know the version numbers of the contributors > beforehand, or can otherwise identify them uniquely (e.g. with tags or > timestamps). So, consider this: > > Apply a tag to the top of the contributor branch before commencing the > merge. (I think rtag works with branch and timestamps, or you can check it > out and apply the tag to the sandbox and then release the sandbox.) Then > use "cvs update" with the appropriate number of -j options to perform the > merge, using the tagged contributors. > > A second benefit to creating a contributor tag is that you can use it as > the common ancestor tag for future 3-way merges, which reduces the number > of conflicts you must resolve by hand. > > >--- Forwarded mail from [EMAIL PROTECTED] > > >We currently have 3 active development branches as well as our trunk. > >Our trunk holds our next major release. Branches A, B, and C hold our > >next three major releases (in that order). About once a week, we merge > >the incremental changes (since the last merge) from the trunk, to branch > >A, then from branch A to branch B, then from branch B to branch C. We > >also have bug fix branches for releases currently in production, and if > >one of them has a new release on it, we merge (or consider merging) > >these changes into the trunk. > > >I have been locking the repository while we do these merges, but some > >developers are complaining. > > >Is it a good or bad practice to lock while merging branches. If we do > >not lock the repository while merging branches, what would be the > >potential result? > > >--- End of forwarded message from [EMAIL PROTECTED] > -- [EMAIL PROTECTED] V-Net: 622-3286 Phone: 1-719-535-3286 Pager: 1-800-724-3624 # 140-1311 ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
branch merging tactics (lock repository or not?)
We currently have 3 active development branches as well as our trunk. Our trunk holds our next major release. Branches A, B, and C hold our next three major releases (in that order). About once a week, we merge the incremental changes (since the last merge) from the trunk, to branch A, then from branch A to branch B, then from branch B to branch C. We also have bug fix branches for releases currently in production, and if one of them has a new release on it, we merge (or consider merging) these changes into the trunk. I have been locking the repository while we do these merges, but some developers are complaining. Is it a good or bad practice to lock while merging branches. If we do not lock the repository while merging branches, what would be the potential result? ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
preventing tag changes in project
In my cvs project, I want tags to never change once they are applied. However, after adding new files, if someone applies a tag that has already been used to the project, the tag is applied to the new files. How can I prevent this? ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Assertion failed: rev == NULL || isdigit ((unsigned char) *rev)
I have an unusual situation: My project has the following tags (in order of appearance): tag_a tag_b tag_c I have been asked to see if I can take the project back to tag_b and then add in the changes made between tag_c and now. So I did the following to see what would happen: cvs checkout my_project cd my_project cvs update -j HEAD -j tag_b cvs update -j tag_c -j HEAD In the binary for Solaris downloaded from cvshome.org, I get the following during the last command: Assertion failed: rev == NULL || isdigit ((unsigned char) *rev), file /u/scjones/cvs-nightly/src/rcs.c, line 3990 cvs [server aborted]: received abort signal cvs --version Concurrent Versions System (CVS) 1.11.1p1 (client/server) ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
cvsweb download problem
I have the latest cgi script from http://www.idaemons.org/~knu/cvsweb/ and am running it with cvs 1.11.1p1 and rcs 5.7 on sun solaris 2.8 with iplanet enterprise server 6.0SP1. Everything seems to work (including annotate), with the exception of clicking on a revision or download link. When accessing these links, the following message occurs: "Error: Unexpected output from cvs co:", followed by the contents of the file in one long string, with no formatting. This is displayed in the browser window. How can I fix this? Thanks, Dave. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: cvswrappers for text files with no merging allowed
Thanks Actually, we do have files that need to be merged, but there are others that shouldn't and should have no keyword expansion either. I didn't want to confuse the issue, since I already knew how to deal with the others. On Mon, Dec 03, 2001 at 01:55:49PM -0500, Larry Jones wrote: > David Everly writes: > > > > I have text files, but they should never be merged. > > Then why are you using CVS? > > > Should I then use > > > > * -k 'o' -m 'COPY' > > > > or should I use > > > > * -k 'b' -m 'COPY' > > > > and does the -m 'COPY' actually have an effect? > > You don't want keyword expansion, either? You should use -ko -- -kb > uses binary I/O, which isn't appropriate for text files. > > > The files have already been checked in, so how do I use cvs admin to > > correct the mistake with respect to the "-m 'COPY'"? cvs admin -m > > appears to have a different meaning. > > There's no need -- the -m status is stored only in the cvswrappers file. > > -Larry Jones > > Somebody's always running my life. I never get to do what I want to do. > -- Calvin -- [EMAIL PROTECTED] V-Net: 622-3286 Phone: 1-719-535-3286 Pager: 1-800-724-3624 # 140-1311 ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: merging branch into trunk while keeping trunk fixes
Please disregard this, I think I fat-fingered something here, because now it works for me the way I think it should. On Mon, Dec 03, 2001 at 11:09:02AM -0700, David Everly wrote: > I have branch MY_BRANCH and HEAD development. There have been fixes > to HEAD and new development that does not have these fixes on > MY_BRANCH. It seems that the fixes to HEAD are not retained when, in > my HEAD work area, I do cvs update -j MY_BRANCH. Instead, files which > seem to have not changed replace the files that have been changed and > commited to HEAD. > > Am I doing something wrong here? Do I have to merge HEAD fixes into > MY_BRANCH first? > > Thanks, > Dave. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
merging branch into trunk while keeping trunk fixes
I have branch MY_BRANCH and HEAD development. There have been fixes to HEAD and new development that does not have these fixes on MY_BRANCH. It seems that the fixes to HEAD are not retained when, in my HEAD work area, I do cvs update -j MY_BRANCH. Instead, files which seem to have not changed replace the files that have been changed and commited to HEAD. Am I doing something wrong here? Do I have to merge HEAD fixes into MY_BRANCH first? Thanks, Dave. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
cvswrappers for text files with no merging allowed
I'm struggling to know what to put in cvswrappers: I have text files, but they should never be merged. Should I then use * -k 'o' -m 'COPY' or should I use * -k 'b' -m 'COPY' and does the -m 'COPY' actually have an effect? The files have already been checked in, so how do I use cvs admin to correct the mistake with respect to the "-m 'COPY'"? cvs admin -m appears to have a different meaning. Thanks, Dave. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: How to bring a branch back on a file when the tag has been moved
I don't like moving or deleting tags, so I have the following taginfo script: #!/bin/sh ## ## do not allow anyone to move or delete tags ## if [ $2 = "mov" ] ; then echo "--->Please do not try to move or change existing tags." exit 1 fi if [ $2 = "del" ] ; then echo "--->Please do not try to delete tags." exit 1 fi On Fri, Nov 30, 2001 at 12:03:22PM -0500, [EMAIL PROTECTED] wrote: > Subject: Re: How to bring a branch back on a file when the tag has been moved > To: [EMAIL PROTECTED] (Prabhu Ram) > Date: Fri, 30 Nov 2001 11:01:52 -0500 (EST) > Cc: [EMAIL PROTECTED] > From: [EMAIL PROTECTED] (Larry Jones) > > Prabhu Ram writes: > > > > We have a branch on which dev. was taking place and someone accidentally > > moved the tag (which is also the branch name) to the tip of the branch. Is > > there a "nice" way of setting the branch back to the branch point ? > > No. CVS won't move an existing tag unless you force it to using the -F > flag, so you may want to beat up any users that always use -F to prevent > future mistakes of that sort. The current development version of CVS > goes one step farther and refuses to convert a branch tag to a revision > tag unless you also specify the -B flag, which should prevent such > accidents completely. > > -Larry Jones > > Sometimes I think the surest sign that intelligent life exists elsewhere > in the universe is that none of it has tried to contact us. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: nonmergeable file needs merge
Thanks...this fixed it... On Thu, Nov 29, 2001 at 04:12:05PM -0800, Paul Sander wrote: > Have you looked into using -ko for this purpose? > > --- Forwarded mail from [EMAIL PROTECTED] > > By the way, the reason I'm using -k 'b' is so that there is no > substitutionbut these should be all mergeable text files. > > --- End of forwarded message from [EMAIL PROTECTED] > -- [EMAIL PROTECTED] V-Net: 622-3286 Phone: 1-719-535-3286 Pager: 1-800-724-3624 # 140-1311 ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
nonmergeable file needs merge
My cvswrappers has: * -k 'b' Then I started getting cvs update: nonmergeable file needs merge. So I tried: * -k 'b' -m 'MERGE' However, the problem still happens...possibly because all the files were checked in on the earlier configuration. What is the setting I really want here, and how do I make sure everything in my repsitory now has it? Thanks, Dave. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: nonmergeable file needs merge
By the way, the reason I'm using -k 'b' is so that there is no substitutionbut these should be all mergeable text files. On Thu, Nov 29, 2001 at 04:12:18PM -0700, David Everly wrote: > My cvswrappers has: > > * -k 'b' > > Then I started getting cvs update: nonmergeable file needs merge. > > So I tried: > > * -k 'b' -m 'MERGE' > > However, the problem still happens...possibly because all the files > were checked in on the earlier configuration. > > What is the setting I really want here, and how do I make sure > everything in my repsitory now has it? > > Thanks, > Dave. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
pvcs2cvs.pl
I ran the following on a copy of my pvcs archives: pvcs2cvs.pl -r flat -p flat Then copied all the *,v files into a cvs root directory which I then did 'cvs init' on. Should I have taken a different approach here? There was a pvcs floating label which originally was defined as 1.* which got converted into 0.1 and it seems I can no longer check out based on that label or that revision number. Also, although the latest version of the files appear to have been "checked out" into the directory along with the ,v and -arc files, the most recent version can not be checked out of this new cvs archive. Is there some work around for this? -- [EMAIL PROTECTED] V-Net: 622-3286 Phone: 1-719-535-3286 Pager: 1-800-724-3624 # 140-1311 ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
stopping 'cvs tag -b'
Since I didn't see any responses, I thought I would ask this once more: How can I keep users from doing 'cvs tag -b' and still allow 'cvs tag' I'm aware of CVSROOT/taginfo, but I don't see any arguments that indicate whether it will create a branch or not. $2 only has 'add', 'mov', 'del'. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
GNU expr
Is GNU expr required for CVS or only for the 'make check' testing of CVS? ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: How to lock CVS for check-in
To recap, I'm looking to a way to lock branches so that people don't accidentaly check out or commit to an 'inactive' branch. I also need the solution to work for those accessing CVSROOT vi the :ext: method. cvs -n stat filename seems only to work from a 'sandbox' point of view. How would I use that in the context of a commitinfo script? On Thu, Oct 11, 2001 at 09:19:38PM -0700, Jerry Nairn wrote: > > > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]] > > Sent: Wednesday, October 10, 2001 10:11 PM > > [ On Thursday, October 11, 2001 at 08:24:11 (+0530), > > Shubhabrata Sengupta wrote: ] > > > Wondering why this enhancement is needed in the commitinfo > > interface when > > > you can always get the branch information out of the > > CVS/Entries file which > > > is always available to the commitinfo script. > > > > I'm not sure the CVS/Entries file is always available, and in any case > > accessing it directly is a very very very bad hack. Its > > cvs -n stat filename > > works very well to get this kind of info from a commitinfo script. You get > it from the CVS/Entries file through a cvs command. > Jerry > > ___ > Info-cvs mailing list > [EMAIL PROTECTED] > http://mail.gnu.org/mailman/listinfo/info-cvs -- [EMAIL PROTECTED] V-Net: 622-3286 Phone: 1-719-535-3286 Pager: 1-800-724-3624 # 140-1311 ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Freezing CVS tags
I'm thinking that what I do works to not allow tag changes: First, I define a 'cvsadmin' group. Second, I place this line in $CVSROOT/CVSROOT/taginfo: ALL $CVSROOT/CVSROOT/tagrules.sh Third, I place tagrules.sh in my $CVSROOT/CVSROOT/checkoutlist Fourth, my tagrules.sh looks like this: #!/bin/sh if [ $2 = "mov" ] ; then echo "--->Please do not try to move or change tags." exit 1 fi if [ $2 = "del" ] ; then echo "--->Please do not try to delete tags." exit 1 fi exit 0 On Fri, Oct 12, 2001 at 04:51:18PM -0400, Larry Jones wrote: > [EMAIL PROTECTED] writes: > > > >Is there a way to freeze the CVS tag? After we create a CVS tag, we would > > like to freeze it so that no one can change it and causes problem, is this > > possible? > > No, but note that CVS won't move an existing tag unless you force it to > by using the -F flag -- simply threaten to break the fingers of any user > who uses it. :-) > > -Larry Jones > > What this games needs are negotiated settlements. -- Calvin > > ___ > Info-cvs mailing list > [EMAIL PROTECTED] > http://mail.gnu.org/mailman/listinfo/info-cvs -- [EMAIL PROTECTED] V-Net: 622-3286 Phone: 1-719-535-3286 Pager: 1-800-724-3624 # 140-1311 ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: killing a branch
Yes, this might work...I was also thinking maybe read/write locks for branches, just in case the branches ever needed to be 're-activated'. On Tue, Oct 09, 2001 at 04:22:58PM -0400, Eric Siegerman wrote: > On Wed, Oct 03, 2001 at 12:18:23PM -0600, David Everly wrote: > > After I merge a branch into the trunk, I would like to make it so that > > people cannot commit to the branch anymore. Would someone please suggest > > a good way of doing this? > > Would it suffice to "cvs rm" everything on the branch, so that > when someone goes "cvs update -rbranch", they get nothing? > > That wouldn't *prevent* someone from committing to the branch, > but it'd give them a pretty strong hint that doing so isn't what > they really want... > > -- > > | | /\ > |-_|/ > Eric Siegerman, Toronto, Ont.[EMAIL PROTECTED] > | | / > The world has been attacked. The world must respond ... [but] we must > be guided by a commitment to do what works in the long run, not by what > makes us feel better in the short run. > - Jean Chrétien, Prime Minister of Canada > > ___ > Info-cvs mailing list > [EMAIL PROTECTED] > http://mail.gnu.org/mailman/listinfo/info-cvs > -- [EMAIL PROTECTED] V-Net: 622-3286 Phone: 1-719-535-3286 Pager: 1-800-724-3624 # 140-1311 ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
stopping 'cvs tag -b'
How can I keep users from doing 'cvs tag -b'? I'm aware of CVSROOT/taginfo, but I don't see any arguments that indicate whether it will create a branch or not. $2 only has 'add', 'mov', 'del'. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
killing a branch
Hello, After I merge a branch into the trunk, I would like to make it so that people cannot commit to the branch anymore. Would someone please suggest a good way of doing this? Thanks, Dave. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Locks, pls help
If I understand what you are trying to do, prehaps this will answer: http://www.cvshome.org/docs/manual/cvs_18.html#SEC171 On Tue, Oct 02, 2001 at 07:11:06PM +0200, raptor wrote: > hi, > > I'm tring a loginfo-script.. and I got lock problems.. > OK first I expected that 'cause the cvs-commit is already finished at > log-info-stage all locks should be already released so I can switch to my > working directory and update it (read) but I have zero success and had > to go to Repository to remove locks manually... > I've read in the manual but the explanation of the LOCKS is too 'blury' .. > First of all I have to create #cvs.lock dir, but how can I create such dir > if I don't know where exactly (in which cvs-reposiroty dir) I have to create > this one (i don't need it anyway)... I'm just chdir-ing to one of the > working-copies (not the one that commits at the moment) and then tring "cvs > update" ... > Is there any way to tell previous/parent(maybe) process to release his lock > so I can freely do my job Anyway, I'm not tring to change repository or > work directly with it, so I don't need to request read-locks ... > > And yes I read -central up-to-date files- thread and the solution with cron > script... The problem is that this doesn't work for me... I and other > developers can't wait 15 min to see their changes, they have to see their > changes almost at the time after they commited their file And the times > when I will have two developers commiting simultaneously are very, very > rare.. > > SO THE MAIN PROBLEM STAYS : HOW CAN I TELL THE PROCESS THAT STARTED LOG-INFO > SCRIPT TO RELEASE HIS LOCKS, SO LOG-INFO CAN DO HIS JOB (again mine > script don't work directly with the repository files so it can't broke > repository internal data, it just do "cvs update"). > One more thing at the time the log-info script is executed everything is > commited successfuly so I don't see a reason for it to hold this lock.. > > Thanx alot for your pation reading this and for the answers of-course :")) > = > iVAN > [EMAIL PROTECTED] > = > PS. I'm new to CVS and hope I'm not missing something obvious, but I think > not :") > > > > > ___ > Info-cvs mailing list > [EMAIL PROTECTED] > http://mail.gnu.org/mailman/listinfo/info-cvs -- [EMAIL PROTECTED] V-Net: 622-3286 Phone: 1-719-535-3286 Pager: 1-800-724-3624 # 140-1311 ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Looking to purchase commercial CVS support
My department is looking to purchase commercial support for CVS. Does anyone do that? If so, who? Thanks, Dave. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
