Re: cvs branch version

2005-07-13 Thread david
But I cannot see this revision with 'cvs log'. Can anyone explain what > happened? > Sure. You now have the file in your working area as branch 1.1.2, but since there is no change from the original version, the only revision is 1.1. This revision is on both the trunk and the br

RE: Renaming a branch

2005-05-05 Thread David Leskovac
>David Leskovac writes: >> >> Okay. So, just to be clear, this is actually a 3-step process: >> 1. Checkout branch: >>cvs co -r >> 2. Rename from sandbox: >>cd to root of module in sandbox >>cvs admin -n newname:oldname >> 3. De

RE: Renaming a branch

2005-05-04 Thread David Leskovac
>> Would this work for each branch to be renamed?: >> cvs rtag -b -r > > No, that creates a new branch off of the existing branch rather than > renaming the existing branch. You need to use admin -n instead. Okay. So rather than the 2-step process I mentioned in my original post where I would

RE: Renaming a branch

2005-05-04 Thread David Leskovac
> You still need a 2-step process, you just use admin -n to create a new > name for the existing branch rather than using tag -b to create a new > branch: > > cvs admin -n newname:oldname > cvs tag -d oldname > > (Note that there's no "radmin" command so you need to have a checked out

Renaming a branch

2005-05-04 Thread David Leskovac
Hi, Sorry for the basic question but I need to implement a new branch naming scheme & want to make sure I am doing this correctly. To start this process, I need to rename several existing branches. Would this work for each branch to be renamed?: cvs rtag -b -r cvs rtag -d I am aware of the

RE: Continuous Integration with CVS

2005-04-27 Thread David Leskovac
> Is any one doing Continuous Integration with CVS ? Yes. We use CruiseControl 2.2.1 -Dave ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs

RE: Nooby question: need help with setting CVSROOT="/usr/local/cvs-rep"

2005-04-21 Thread David Leskovac
> It's working just as designed. :-) Variables that stay > around "permanently" only stay that way as long as you are > logged in. I suggest adding it to your .bashrc file in your > home directory. UNIX/Linux process that file every time a new > terminal session is opened and will set it autom

Re: Idea for reducing disk IO on tagging operations

2005-03-28 Thread Dr. David Alan Gilbert
ed this means that an existing cvs client can quite happily read a repository which has had my patch inflicted on it. (The existing cvs code that rewrites the file will remove any excess white space you added up there anyway.) Dave -Open up your eyes, open up your mind, open up your code ---

Re: Idea for reducing disk IO on tagging operations

2005-03-28 Thread Dr. David Alan Gilbert
ion my debian happened to have. As I say, suggestions - and experiences welcome. Dave -Open up your eyes, open up your mind, open up your code --- / Dr. David Alan Gilbert| Running GNU/Linux on Alpha,68K| Happy \ \ gro.gilbert @ treblig.org | MIPS,x86,ARM,SPARC,PPC & HPPA | In

Re: Idea for reducing disk IO on tagging operations

2005-03-23 Thread Dr. David Alan Gilbert
* Jim Hyslop ([EMAIL PROTECTED]) wrote: > Dr. David Alan Gilbert wrote: > > 2) I could do with a better under standing of the directory locks; > > pointers? I've read the top of lock.c but it still doesn't tell me > > enough; for example there seem to be multiple

Re: Idea for reducing disk IO on tagging operations

2005-03-22 Thread Dr. David Alan Gilbert
ess worried by this; I'm failing to see any way that a single system call write() to a block not crossing a block boundary could partially fail; but I'm up for suggestions. Dave -Open up your eyes, open up your mind, open up your code --- / Dr. David Alan

Re: Idea for reducing disk IO on tagging operations

2005-03-20 Thread Dr. David Alan Gilbert
* Mark D. Baushke ([EMAIL PROTECTED]) wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA1 > > Dr. David Alan Gilbert <[EMAIL PROTECTED]> writes: > > > > OK, if I create a dummy ",foo.c," before > > modifying (or create a hardlink with that n

Re: Idea for reducing disk IO on tagging operations

2005-03-20 Thread Dr. David Alan Gilbert
rmance by as So are these tricks *never* performed by cvs itself? i.e. would my trick (if I can solve the interrupted write case) be completely safe with any use of cvs as long as you didn't access the files externally? Dave -Open up your eyes, open up your mind, open up your code ---

Re: Idea for reducing disk IO on tagging operations

2005-03-20 Thread Dr. David Alan Gilbert
[Resend: I sent it with the wrong 'from' address - apologies if you get both] * Mark D. Baushke ([EMAIL PROTECTED]) wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA1 > Hi Mark, Thanks for your reply. > Dr. David Alan Gilbert <[EMAIL PROTECTED]> wri

Idea for reducing disk IO on tagging operations

2005-03-20 Thread Dr. David Alan Gilbert
rewrite essential to ensure consistency, or is the locking that is carried out sufficient? Does this make sense? Dave -Open up your eyes, open up your mind, open up your code --- / Dr. David Alan Gilbert| Running GNU/Linux on Alpha,68K| Happy \ \ gro.gilbert @ treblig.org | MI

Re: "cvs release" does not update the CVS/Entries(.log) file

2005-03-15 Thread david . andersson
Larry Jones writes: > Reinstein, Shlomo writes: > > > > I would like to use "cvs release" to get rid of a sub-tree of my project. > > However, I noticed that "cvs release" does not update the "CVS/Entries" (or > > "CVS/Entries.log") file, which causes a problem later when I want to run > > other co

RE: Renaming a file in the trunk but not in branches

2005-03-11 Thread David Leskovac
way to rename a file in the trunk & retain the history of the oldfile in the newfile while keeping the oldfile intact in the branches? Thanks, -Dave -Original Message- From: Jim.Hyslop [mailto:[EMAIL PROTECTED] Sent: Friday, March 11, 2005 10:33 AM To: David Leskovac; info-cvs@gnu

Renaming a file in the trunk but not in branches

2005-03-11 Thread David Leskovac
Hi, Will the following commands work to rename a file in the trunk but retain the old file name in all its branches?: cvs co cvs remove -f cvs add cvs commit -m"Renamed to " Thanks, -Dave ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.

Re: CVS Server times

2005-02-25 Thread David A. Bartmess
On Thursday 24 February 2005 11:33 pm, Guus Leeuw jr. wrote: > > -Original Message- > > From: [EMAIL PROTECTED] [mailto:info-cvs- > > [EMAIL PROTECTED] On Behalf Of David A. Bartmess > > Sent: vendredi 25 février 2005 06:53 > > > > On Thursday 24 Febr

Re: CVS Server times

2005-02-24 Thread David A. Bartmess
d seriously screw with any automation that relies on the datetime stamp to know if a build has already included that change (i.e., cruisecontrol). Just FYI... -- David A. Bartmess Software Configuration Manager / Sr. Software Developer eDingo En

RE: Restricting use of 'cvs rtag' & 'cvs tag' commands [2nd try]

2005-02-23 Thread David Leskovac
> Install cvs in a different place than the version you are using. > > Make a script named cvs in the current location of cvs. That > script should check the cvs commands vs. valid users. If > everything is OK, then it should invoke the new cvs in the > new place with the arguments passed to it.

Restricting use of 'cvs rtag' & 'cvs tag' commands [2nd try]

2005-02-23 Thread David Leskovac
[I sent this msg 10 days ago & noone responded. So, I'm trying again.] Hello, We are currently using an ancient version of CVS (1.11.1p1) on a rather old Linux server (Red Hat 6). I intend to upgrade to CVS 1.11.19 & eventually upgrade the Linux OS. In the course of our CVS upgrade discussion w

Re: braches best usage

2005-02-21 Thread David A. Bartmess
__ > Express yourself instantly with MSN Messenger! Download today - it's FREE! > http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/ > > > > ___ > Info-cvs mailing list > Info-cvs@gnu.org > http://

Re: jar files in cvs repository

2005-02-21 Thread David A. Bartmess
:39 am, Jesper Vad Kristensen wrote: > David Bartmess wrote: > >Used in the cvswrappers file, the -m gives the mode of the > >file to the cvs > >admin command, setting the mode of the file to either COPY (do > >not delta the > >file, put a full version in ev

Re: cvs and ssh

2005-02-19 Thread Jean-Rene David
Please don't top post. * Serbulent UNSAL <[EMAIL PROTECTED]>: > No i am a newbie for cvs and trying to install it first. But after > installation i can't connect. Well from your original message, it looks like it's installed fine. But then you're trying to check something out of an empty reposito

Re: cvs and ssh

2005-02-18 Thread Jean-Rene David
* Serbulent UNSAL <[EMAIL PROTECTED]>: > # cvs -d /var/cvsroot init > # chown -R cvs.cvs /var/cvsroot > > #export CVS_RSH=ssh > > Here is the error message > > usta:/home/usta# cvs -d :ext:[EMAIL PROTECTED]:/var/cvsroot checkout > module > Password: Did you import anything in your repository

Re: jar files in cvs repository

2005-02-18 Thread David A. Bartmess
ge >Use message as log information, instead of >invoking an editor. > > Regards, > > Jesper Vad Kristensen > Aarhus, Denmark. > > > ___ > Info-cvs mailing list > Info-cvs@gnu.org > http://lists.gnu.org/mailman/listinf

Re: Info-cvs Digest, Vol 27, Issue 40

2005-02-16 Thread David A. Bartmess
pecific > > than "Re: Contents of Info-cvs digest..." > > > > Today's Topics: > > > > 1. jar files in cvs repository (Rajeev R) > > 2. RE: jar files in cvs repository (Jesper Vad Kristensen) > > 3. Re: Undo check out (David A. Bartmess)

Re: Undo check out

2005-02-16 Thread David A. Bartmess
; > -- > Paul Sander | "When a true genius appears in the world, you may > [EMAIL PROTECTED] | know him by this sign: that all the dunces are in > >| confederacy against him." -- Jonathan Swift, > > writer. > > > > _

Restricting use of 'cvs rtag' & 'cvs tag' commands

2005-02-15 Thread David Leskovac
Hello, We are currently using an ancient version of CVS (1.11.1p1) on a rather old Linux server (Red Hat 6). I intend to upgrade to CVS 1.11.19 & eventually upgrade the Linux OS. In the course of our CVS upgrade discussion we started discussing how to increase security with regards to CVS acce

Can I allow user to only have permission in branches but not HEAD?

2005-01-10 Thread David Jiao
Hi, I have a question about how access permissions on branches and HEAD. I want to restrict certain CVS users to only be able to commit their changes to branches but not the HEAD. Yet at the same time, I want to allow them to check out modules from the HEAD. Is this doable? Thanks! David Jiao

Re: Please help troubleshooting connection problem via SSH

2004-10-07 Thread J. David Boyd
Chris Weiss <[EMAIL PROTECTED]> writes: > J. David Boyd wrote: > > >Chris Weiss <[EMAIL PROTECTED]> writes: > > > > > >>I've got one client who is having trouble connecting to our CVS > >>server. I'm trying to troubleshoot the pro

Re: Please help troubleshooting connection problem via SSH

2004-10-07 Thread J. David Boyd
Chris Weiss <[EMAIL PROTECTED]> writes: > I've got one client who is having trouble connecting to our CVS > server. I'm trying to troubleshoot the problem, but am not having much > luck. > > Our setup is CVS server 1.11.5, client 1.11.1.3, we're connecting via > SSH tunnel. We've got the keys syn

Re: [cvsnt] Re: Problem with OpenSSH version 3.9p1

2004-09-15 Thread David Robison
I rolled back to an older version of cygwin1.dll and all works fine now! David Tony Hoyle wrote: David Robison wrote: I recently did an update from cygwin and updated to OpenSSH version 3.9p1. Now, every time I try to work with a CVS repository that uses SSH authentication, the csv process hangs

Cannot access ^M/CVSROOT

2004-09-15 Thread David Robison
ry What is interesting is that between the "master" and the "/CVSROOT" is a 0x0d character. This seems to be causing trouble, Any idea where this is coming from? Any idea what to try? Any help would be appreciated. David Robison -- David R Robison Open Roads Consulting

RE: Do most people checkout read-only and use "cvs edit"?

2004-07-07 Thread Karr, David
only and use "cvs edit"? > > > On Wed, 2004-07-07 at 14:01, Karr, David wrote: > > Or, do people checkout read-write and never use "cvs > > edit"? > > Yup, that's what I do. Optimistic locking and all that sort > of thing, you know... > >

Do most people checkout read-only and use "cvs edit"?

2004-07-07 Thread Karr, David
I have a question about how people use CVS. How common is it to always checkout and update read-only, and then use "cvs edit" when you start working on a file? Or, do people checkout read-write and never use "cvs edit"? I have always thought that modules should be checked out read-only, and "cvs

How to make "checkout" and "update" leave files read-only?

2004-07-06 Thread Karr, David
I'd like to ensure that only files that I've done "cvs edit" on are writable. I've used CVS in the past, and I thought I was able to set it up this way. I added "cvs -r" to my $HOME/.cvsrc file (along with other settings that are working), but "update" is leaving files writable that I haven't "ed

Why does "cvs status" send the entire file to the server (apparently)?

2004-07-04 Thread Karr, David
The connection to my cvs server is somewhat slow from where I am right now, so I can clearly see when things are taking a long time. I tried running "cvs -t status -v" so I could see more details of what's happening. It appears that for each file it encounters, it is sending the entire contents o

"inflate: unknown compression method" after server upgrade to 1.11.16

2004-06-30 Thread David Carson
update: inflate: unknown compression method cvs [update aborted]: reading from server: Input/output error Server: cvs 1.11.16 RedHat 7.2 Client: cvs 1.11.1p1 RedHat 7.2 Note that I have many clients deployed, so I'd like to understand the problem (not just deploy newer clients). Thanks,

RE: File date and timestamp

2004-06-29 Thread Flagg, David
them of any changes with that particular capability. -Original Message- From: Jim.Hyslop [mailto:[EMAIL PROTECTED] Sent: Monday, June 28, 2004 11:45 AM To: Flagg, David; [EMAIL PROTECTED] Subject: RE: File date and timestamp Flagg, David wrote: > This is a re-post. This seems like

File date and timestamp

2004-06-28 Thread Flagg, David
This is a re-post. This seems like it could possibly be a common problem someone might have. Is there a more appropriate forum somewhere else? Thanks. > -Original Message- > From: Flagg, David > Sent: Friday, June 25, 2004 10:26 AM > To: '[EMAIL PROT

File data and timestamp

2004-06-25 Thread Flagg, David
I have a binary file that is in my repository, libtemp.a, which has the following timestamp in cvsroot (i.e., timestamp in the Unix filesystem): Jun 18 09:42. Apparently, this is the time when I last tagged the file. When I check out the file (with WinCVS, by the way), the date on the file is (

Re: how to checkin binary files

2004-04-22 Thread David A. Desrosiers
> May someone tell me how to checkin a binary file into my repository? > Thanks a lot.. man 1 cvs Look for the -k options. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs

Re: Major revision numbers

2004-04-07 Thread david
> [EMAIL PROTECTED] wrote: > > revision numbers are for CVS's internal use, you should not care what > > they are. Use tags if you want meaningful information. > Weee... for the most part I agree. > > However, there are times when you need to compare two revisions that are not > tagged. If we

Re: Binary release announcements?

2004-02-19 Thread david
> [ On Wednesday, February 18, 2004 at 10:21:41 (-0500), Jim.Hyslop wrote: ] > > Subject: RE: Binary release announcements? > > > If you can't, or won't, build the software you use yourself then you > need to find someone who can _and_ who you trust to do that for you. > Some people seem to be awfu

Re: Pros/Cons - Concurrent Editing

2004-02-13 Thread david
> What are the pros and cons of concurrent editing?. CVS supports and > advocates concurrent editing, whereas configuration tools like VSS use the > "locked" model of editing, to which the developers are very much used to. > What are the benefits of concurrent editing ( using CVS ) and what > p

Re: Best Practices enquiry

2004-02-05 Thread david
> > On the flip side, and maybe this is what Jim really meant, you can tag > your committed versions on the contributor branch when the bug fix is > done (and after the merge is complete). Then remember that tag for the > next bug fix. You can use that tag as the common ancestor for the next > m

Re: CVS server upgrade?

2004-02-02 Thread David R. Chase
Jim, Just wondering what minor problems you had, just in case they might pertain to other peoples' migration strategies (or my own someday)? Thanks! David R. Chase Senior Unemployed Software Developer ; ) - Original Message - From: "Jim.Hyslop" <[EMAIL PROTECTED]>

Re: what's to stop a developer from nuking the repository?

2004-01-21 Thread david
> [ On Tuesday, January 20, 2004 at 15:13:08 (-0600), [EMAIL PROTECTED] wrote: ] > > Subject: Re: what's to stop a developer from nuking the repository? > > > > > If you have a trusted network and you do feel comfortable with telnet > > > and rlogin then USE THEM -- DO NOT USE PSERVER. > > > > > Th

Re: what's to stop a developer from nuking the repository?

2004-01-20 Thread david
> [ On Tuesday, January 20, 2004 at 11:03:38 (-0500), Larry Jones wrote: ] > > Subject: Re: what's to stop a developer from nuking the repository? > > > > I think that's still overstating the case. If you run CVS on a network > > where you can trust people enough that you're confortable running >

Re: what's to stop a developer from nuking the repository?

2004-01-20 Thread david
> > Please forgive me if I am mistaken, and in any case I certainly don't want >to start a flame war, but am I right in thinking that Greg's opinion does >not reflect the majority view? > I can't speak for the majority, but I pretty much agree with Greg. Quibble time: *if* you run cvs on a n

suscribe

2004-01-17 Thread Prince David
  ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs

verifymsg working with netbeans & eclipse?

2003-12-23 Thread David Muller
rmissions are correct in fact via the command line and tortoisecvs it works fine. Anyone have experience with this problem? Thanks, -Dave ____ David E. Muller Configuration Manager Overture Services, Inc.  www.overture.com Office: 760.476.640

cvs-1.11.10 win32 VC98 cannot find "assert" during build

2003-12-16 Thread David Everly
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

Re: False status indication with WinCvs 1.2

2003-12-12 Thread David Wood
I've seen this before; it's related to daylight savings time issues with Windows. WinCVS 1.3 has the fix, 1.2 doesn't. As far as I could tell it was an annoyance that killed performance and ruined the effectiveness of the in-pane modified reporting, but I couldn't think of a case where it was a

Re: SSHD user-switching under Cygwin/XP (was Re: Case insensitivity ad nauseum)

2003-12-10 Thread David Wood
Now I'm really out on a limb, but, what user is sshd running as before it switches? Does logging into sshd without a password, using a key instead, merely mean that no switch from this "default sshd user" occurs? If that's the case, can we adjust the "default user" that sshd runs as? [EMAIL PRO

Re: CVS Version CHange

2003-12-03 Thread david
Greg Woods: > > In CVS the release number of RCS-Id is like any useless and almost > atrophied organ -- however it's impossible to give it up without > also giving up backwards compatability of the internal repository > structure. > It also is necessary as a "magic cookie" - an otherwise meaningle

Re: Limitation on --allow-root pserver options?

2003-12-02 Thread David Wood
You could consider using xinetd alongside Solaris inetd (just for the CVS port). It would be a simple experiment to set it up and see if it, too, exhibits the problem. [EMAIL PROTECTED] wrote on 12/02/2003 03:38:25 AM: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA1 > > Mark <[EMAIL PROTEC

Re: Please help..

2003-11-26 Thread David Wood
think of reasons why it wouldn't be. Of course, there's not much to lose in performing the experiment, as long as you take care and keep copies of everything. I'll be curious to hear if following these instructions would work. [EMAIL PROTECTED] wrote on 11/26/2003 02:46:

Re: Case insensitivity ad nauseum

2003-11-26 Thread David Wood
Is the problem that you're not sure how to get the network drive into the sshd filesystem root? Or that when you try to that it fails? If it were the latter, it would be reminiscent of a similar problem I had trying to get apache to serve files from a network drive on Windows XP. We found that

Re: Please help..

2003-11-26 Thread David Wood
your repository somewhere separate (/home/cvs/repository ?). And of course, have another go at the manual (or some of the other reading materials) to get a better handle on how the system works. John Wards <[EMAIL PROTECTED]> wrote on 11/26/2003 12:25:42 PM: > On Wednesday 26 Novem

Re: Please help..

2003-11-26 Thread David Wood
Two things. First, did you work for 18 months on something without making backups? If you never made backups, then whether it was a mistake setting up CVS, some other kind of mistake, hardware failure, fire, or theft, you were destined to lose your work. I hope, however you resolve this issue

Re: CVS admin

2003-11-23 Thread david
> How do I set-up my self as a cvs admin on the server > side? > What do you mean by "cvs admin"? As a CVS administrator, you should have full permissions on the repository or repositories. To use "cvs admin" commands, either have no Unix group "cvsadmin", or be a member yourself. -- Now buildi

pretty printer on commit

2003-11-14 Thread David Everly
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. ___

Re: CVS merge

2003-11-12 Thread David Wood
I think the problem is the start and end points of your merge. If I have a trunk, and I created a branch from that trunk, tagging it at the point it was created, I would use the following to merge the branch back into the trunk: -j branch_CREATED -j branch Often this can simply be abbreviated

Re: Can't create a module in cvswin1.13

2003-11-11 Thread David Wood
Do you have a log of what happened during the import, and during your attempt to check out? How are you setting your CVSROOT, in an environment variable, or on the command line? Are you using the command line cvs, or wincvs (etc)? [EMAIL PROTECTED] wrote on 11/11/2003 02:52:07 PM: > Dear All

Re: Rephrasing: question about merging branches

2003-11-07 Thread David Wood
Derek Robert Price <[EMAIL PROTECTED]> wrote on 11/06/2003 04:37:03 PM: > I see it now, and I thought that the conflicts you now say don't occur > were the ones you objected to in the first place. Not at all. The conflicts that troubled me were happening because I was double-merging (when bringin

Re: Rephrasing: question about merging branches

2003-11-06 Thread David Wood
Derek Robert Price <[EMAIL PROTECTED]> wrote on 11/06/2003 08:57:22 AM: > The way to avoid only processing this for whole branch merges is to > track individual commits as change sets. For example, store that the > sum of changesets for file1 1.2 -> 1.2.4.7 have been merged into the > trunk. The

Re: Rephrasing: question about merging branches

2003-11-05 Thread David Wood
Derek Robert Price <[EMAIL PROTECTED]> wrote on 11/05/2003 12:43:14 PM: > "Greatest Common Ancestor", or GCA, is a term that refers to the RCS > revision structure and always means the more recent revision two > revisions have in common, often a branch point, but in the case of a > branch of a bran

Re: Rephrasing: question about merging branches

2003-11-05 Thread David Wood
Derek Robert Price <[EMAIL PROTECTED]> wrote on 11/05/2003 10:38:02 AM: > No. The GCA has not changed and CVS determines it correctly. You > simply no longer wish to merge from the GCA forward because some of > those changes were already merged to your destination (from another > branch and at yo

Re: Rephrasing: question about merging branches

2003-11-05 Thread David Wood
r branch. Surely **everyone** will need to do this, > sooner or later? > > Andy Jones. > > > > > At 03:37 am 5/11/03, David Wood wrote: > >I am not sure about something. > > > > > |>If branch A and branch B in your example don't branch form t

Re: Rephrasing: question about merging branches

2003-11-04 Thread David Wood
I am not sure about something. > |>If branch A and branch B in your example don't branch form the same > |>point on the trunk, a merge from point 2 to point 4 into the trunk might > |>still not do what you want. If branch B branched first, then 2->4 may > |>back out changes made to the trunk bet

Re: Rephrasing: question about merging branches

2003-11-04 Thread David Wood
g received common chagnes by, and resolved conflicts with) branchA... and the merge delta with the trunk must now use branchA (at point 2) as a reference point in order to correctly reflect changes against the trunk. It is potentially confusing, but you have made it seem very simple. Thank yo

Rephrasing: question about merging branches

2003-11-04 Thread David Wood
child If so, what happens to changes from before the first_child_merge_point? -David ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs

Merge point confusion.

2003-11-03 Thread David Wood
erstanding the way CVS is deciding what to do with merge from and to points, and I cannot find answers to questions this specific in the references. Does anyone who is frighteningly familiar with merging understand what's going on here? -David __

checkin comments between tags

2003-10-30 Thread David Muller
Title: checkin comments between tags How do I get a list of all the checking comments between 2 labels (or since the last label). -Dave David E. Muller Configuration Manager Overture Services, Inc.  www.overture.com Office: 760.476.6406 Mobile

Re: Conflict committed

2003-10-29 Thread David Wood
Thank you for the advice about commitinfo. I believe we will do exactly that as a safeguard against future problems. I totally respect that CVS should be content agnostic, although I did have to rename my "cvs" java package to "cvsutil" because you can't have dirs named "cvs" in the repository.

Re: Conflict committed

2003-10-29 Thread David Wood
Thank you! This is very helpful in reconstructing what happened. [EMAIL PROTECTED] (Larry Jones) wrote on 10/29/2003 11:40:51 AM: > David Wood writes: > > > > Are my assumptions about this mistaken? What circumstances allow > > unresolved conflicts to be committed b

Conflict committed

2003-10-29 Thread David Wood
assumptions about this mistaken? What circumstances allow unresolved conflicts to be committed back to the repository? -David ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs

Re: Commit Error and Checkout Error

2003-10-28 Thread david
> Hi, > > I am able to login into Cvs as root as well as a user. > when I have logged in as a root i face some difficulties when trying to commit a file after making changes to the file.It says root is not allowed to commit files. > Right; "root" is not allowed to commit files. This is a des

Re: Procedural ways of using CVS.

2003-10-21 Thread David Wood
x" parser whose job is to flag conflicts. Then you'd do your build and any other tests you want to do. The second use involves committing the merge and tagging the destination branch. [EMAIL PROTECTED] wrote on 10/17/2003 02:51:30 PM: > > David, > > Read through your proc

Re: Procedural ways of using CVS.

2003-10-17 Thread David Wood
I'll share what I've developed; it may be helpful to you and helpful to me as well, if anyone has comments. Keep in mind that every situation may require a different approach to CVS, and ours is _not_ the most common usage pattern (the most common, I think, focuses on systems or application sof

Re: CVS refuses to remove (branch) tag

2003-10-15 Thread david
> > By default, since 1.11.2, CVS refuses to delete and move branch tags > unless you tell it you know that you are disturbing a branch tag using > the `-B' option to tag or rtag. This is because disturbing branch tags > is usually a VERY VERY VERY etc. bad idea. FWIW, if CVS had done that in 1.

Re: Stale lock files with "anonymous" CVS

2003-10-13 Thread David Wood
Accessing with pserver. Server is 1.11.7. Client is WinCVS version 1.3.13.1 (Beta 13 Build 1). Both are on Solaris 9. And this is the only problem I've found with this setup. [EMAIL PROTECTED] (Larry Jones) wrote on 10/13/2003 11:49:37 AM: > David Wood writes: > > > &g

Stale lock files with "anonymous" CVS

2003-10-13 Thread David Wood
condition would make them notoriously abusable (i.e. trivial, evil DOS attack), I assume I must be doing something wrong. Does anyone have any ideas? Thanks, -David ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs

Re: pserver never starts running

2003-10-06 Thread david
]...Could not open a connection to host on port 2401 : Connect > failed. ([host] is either jake or 192.168.0.155) > Have you rebooted or anything since putting this in cvspserver? Or typed kill -SIGUSR2 xinetd as root, to get xinetd to reread its configuration files? If you've done either

Re: cvs-1.11.7 seems to have changed the api for "release"

2003-10-03 Thread David Everly
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

cvs-1.11.7 seems to have changed the api for "release"

2003-10-01 Thread David Everly
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. __

[lawrence.jones@eds.com: Re: Stable CVS 1.11.7 Released! (Derek Robert Price)]

2003-09-30 Thread David Everly
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 Generi

Re: Stable CVS 1.11.7 Released! (Derek Robert Price)

2003-09-30 Thread David Everly
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 o

RE: Stable CVS 1.11.7 Released! (Derek Robert Price)

2003-09-30 Thread David Everly
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 d

Re: Countering the usual diatribe against binary files, was Re: cvs diff, proposal for change

2003-09-09 Thread david
> On Tue, 2003-09-09 at 14:53, Greg A. Woods wrote: > > [ On Tuesday, September 9, 2003 at 10:10:46 (-0400), Tom Copeland wrote: ] > > > Subject: Re: Countering the usual diatribe against binary files, was Re: cvs > > > diff, proposal for change > > > > > > Hm. Do CVS branches not work right wit

Countering the usual diatribe against binary files, was Re: cvs diff, proposal for change

2003-09-08 Thread David Clunie
ons, fits the bill. The "-kb" flag is the greatest thing since sliced bread, apart from the long forgotten versioning file system of VMS that might also have been a suitable solution for us. If there is something "undesirable" going on inside CVS that is problematic, I would be

Re: Cannot add file on non-branch tag

2003-09-05 Thread david
> Hi All > > I am trying to add a file on a following specific path on a branch named > "bname" > Though I am able to add a file on some other location path. > The error is - > > cvs server: cannot add file on non-branch tag bname > > I have checked the other files existing on this path are br

Re: Checking out without lock

2003-09-05 Thread david
> I have read access to the CVS repository but no write access. > Obviously this means I cannot commit any changes. But it ought to be > possible to get a checkout. However even if I turn off history > logging, cvs co won't work because it wants to make a lock file. > > Is there some option simi

Re: pserver handle multiple requets?

2003-09-05 Thread david
> hi, > can pserver handle multiple requests(say 15 - 20) at the same > time? > Always did whan I was administering it. -- Now building a CVS reference site at http://www.thornleyware.com [EMAIL PROTECTED] ___ Info-cvs mailing list [EMAIL PROT

RE: tools for deleting the expanded $Log$ comments

2003-08-14 Thread David
ti-thread (with 1 registered patch, see perl -V for more detail) Copyright 1987-2001, Larry Wall Binary build 631 provided by ActiveState Tool Corp. http://www.ActiveState.com Built 17:16:22 Jan 2 2002 Thanks in advance for any help, David -Mensaje original- De: Zieg, Mark [mailto:[

Re: how to really remove the information of the file?

2003-08-14 Thread david
> When you remove a file from the repository you actually mark it as dead, and it stays in the repository.. Therefore the upcount in revision numbers. > Yes. CVS has no way to distinguish between two different files with the same names and the same location in the directory structure. > I thin

tools for deleting the expanded $Log$ comments

2003-08-14 Thread David
revision, or because your are using your class on another project. Do you have any suggestion about how to handle such situation. For example I would like to replace the expanded comments by $Log$, becase I wanto to use such source files on another project. Thanks in advance, David

  1   2   3   4   5   6   7   8   9   >