subscribe

2004-06-17 Thread Saar Machtinger
Saar Machtinger PDM Product Manager OptiTex Ltd. T: +972-3-9049979 F: +972-3-9042710 M: +972-54-5558335 Email: [EMAIL PROTECTED] Website: www.OptiTex.com <>___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinf

Can one user develop concurent versions ?

2004-06-17 Thread Adrian Constantin
Hello I work on my project from two computers (work and home) plus one version which I keep on the company's server where I seldom work. So I have three checked out copies of the project, using the same user. I can't really ask for more users on the company's server for me. I wonder if someti

RE: Can one user develop concurent versions ?

2004-06-17 Thread Jim.Hyslop
Adrian Constantin wrote: > I work on my project from two computers (work and > home) plus one version which I keep on the company's server > where I seldom work. So I have three checked out copies of > the project, using the same user. I can't really ask for more > users on the company's server

RE: Can one user develop concurent versions ?

2004-06-17 Thread Christopher.Fouts
Sounds like you just want your company's server as the remote CVS repository, and use remote access methods like pserver or ext via SSH/RSH. -chris >-Original Message- >From: [EMAIL PROTECTED] >[mailto:[EMAIL PROTECTED] >] On Behalf Of Adrian Constantin >Sent: Thursday, June 17, 2004 8:1

Re: Can one user develop concurent versions ?

2004-06-17 Thread Spiro Trikaliotis
Hello Adrian, * On Thu, Jun 17, 2004 at 05:16:23AM -0700 Adrian Constantin wrote: > I work on my project from two computers (work and home) plus one > version which I keep on the company's server where I seldom work. So I > have three checked out copies of the project, using the same user. I do

RE: strange cvs diff problem with pcl-cvs and viewcvs

2004-06-17 Thread Christopher.Fouts
Note that this is a CVS user group, not ViewCVS or PCL-cvs. if "cvs diff ..." works, then consult the appropriate news group. -chris >-Original Message- >From: [EMAIL PROTECTED] >[mailto:[EMAIL PROTECTED] >] On Behalf Of Fabian Braennstroem >Sent: Tuesday, June 15, 2004 2:41 AM >To: [EMA

Re: Can one user develop concurent versions ?

2004-06-17 Thread Frederic Brehm
At 08:16 AM 6/17/2004, Adrian Constantin wrote: I wish cvs not to rely to much on the assumption each user works on exactly one version, one copy. CVS keeps the local state information in the CVS directories in your sandbox. If you have different sandboxes in different states, then that's OK with

Re: Can one user develop concurent versions ?

2004-06-17 Thread Adrian Constantin
Thank you everyone. Glad to hear it is all ok. --- Spiro Trikaliotis <[EMAIL PROTECTED]> wrote: > Hello Adrian, > > * On Thu, Jun 17, 2004 at 05:16:23AM -0700 Adrian > Constantin wrote: > So I > > have three checked out copies of the project, > using the same user. > > I do this myself very oft

cvs merging - conflict

2004-06-17 Thread Feldmann, Rick
I read somewhere that cvs update uses diff to figure out modifications to the files. However, it doesn't appear to use the same diff as cvs diff - Part of it is the white space issue, and there doesn't appear to be and option in update to ignore white space. However, regardless of how I cvs diff

Files under CVS control, but not in the repository

2004-06-17 Thread Anand Graves
I am developing a website in PHP, but not all the files can be found in one directory. For example I have a directory and within there are files for css, javascript, etc. But I have configuration and library files outside this directory, for example /var//libraries and /var//configuration. Is it

RE: Files under CVS control, but not in the repository

2004-06-17 Thread Jim.Hyslop
Anand Graves wrote: > I am developing a website in PHP, but not all the files can > be found in one directory. For example I have a directory > and within there are files for css, javascript, > etc. But I have configuration and library files outside this > directory, for example /var//librarie

Re: cvs merging - conflict

2004-06-17 Thread Kaz Kylheku
On Thu, 17 Jun 2004, Feldmann, Rick wrote: > I read somewhere that cvs update uses diff to figure out modifications to > the files. The merging algorithm is based on the three-way merge program diff3. > However, it doesn't appear to use the same diff as cvs diff - That's correct. diff and di

RE: cvs merging - conflict

2004-06-17 Thread Feldmann, Rick
Kaz, Thanks for the reply. Nice explanation of the differences. As for white space, I'm not asking for the machine to blindly throw white space away, I'm asking for the ability to tell the machine to throw away white space. It doesn't even have to be the default, just an option. In some case

Re: Can one user develop concurent versions ?

2004-06-17 Thread Mark D. Baushke
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Adrian Constantin <[EMAIL PROTECTED]> writes: > I work on my project from two computers (work and > home) plus one version which I keep on the company's > server where I seldom work. So I have three checked > out copies of the project, using the same

RE: cvs merging - conflict

2004-06-17 Thread Jim.Hyslop
Feldmann, Rick wrote: > "Confidentiality Notice: The information contained in this > transmission is > confidential, proprietary, or privileged and may be subject > to protection > under the Health Insurance Portability and Accountability Act > of 1996 or > other legal sanction. The message i

Re: cvs merging - conflict

2004-06-17 Thread Kaz Kylheku
On Thu, 17 Jun 2004, Feldmann, Rick wrote: > Date: Thu, 17 Jun 2004 11:53:55 -0400 > From: "Feldmann, Rick" <[EMAIL PROTECTED]> > To: 'Kaz Kylheku' <[EMAIL PROTECTED]> > Cc: "'[EMAIL PROTECTED]'" <[EMAIL PROTECTED]> > Subject: RE: cvs merging - conflict > > Kaz, > > Thanks for the reply. Nice e

Re: How to extract fine-grained snapshot history?

2004-06-17 Thread Kynn Jones
Date: Wed, 16 Jun 2004 13:03:57 -0400 From: Scott Moynes <[EMAIL PROTECTED]> Kynn Jones wrote: >Therefore, my question is: > > 1. How to extract the times of all the commits to a project > (including recursively all subprojects, of course). > > 2. How to asso

Re: Assert error checking out tagged files with -p option

2004-06-17 Thread Abhinandan Jain
You are right. Our problem looks like the same one that has been reported as a bug. Thats reassuring. I will use the workaround until it gets fixed in CVS. Thanks for pointing this out. Abhi > I think that the problem is that the 'val-tags' admin file is being checked > for an entry and new tags

cvs merging - conflict

2004-06-17 Thread work
Jim Hyslop pointed out that my confidential message wouldn't allow a reply so I setup a different mailbox for the list that doesn't contain such restrictions. This is a repeat of my eariler message. I read somewhere that cvs update uses diff to figure out modifications to the files. However,

Re: cvs merging - conflict

2004-06-17 Thread Paul Sander
>--- Forwarded mail from [EMAIL PROTECTED] >On Thu, 17 Jun 2004, Feldmann, Rick wrote: >> Date: Thu, 17 Jun 2004 11:53:55 -0400 >> From: "Feldmann, Rick" <[EMAIL PROTECTED]> >> To: 'Kaz Kylheku' <[EMAIL PROTECTED]> >> Cc: "'[EMAIL PROTECTED]'" <[EMAIL PROTECTED]> >> Subject: RE: cvs merging - con

Re: CVS corrupts binary files ...

2004-06-17 Thread Greg A. Woods
[ On Tuesday, June 8, 2004 at 15:01:10 (-0700), Adrian Constantin wrote: ] > Subject: Re: CVS corrupts binary files ... > > > --- "Greg A. Woods" <[EMAIL PROTECTED]> wrote: > > [ On Saturday, June 5, 2004 at 13:01:48 (-0700), > > Adrian Constantin wrote: ] > > > Subject: Re: CVS corrupts binary f

Re: CVS corrupts binary files ...

2004-06-17 Thread Greg A. Woods
[ On Tuesday, June 8, 2004 at 16:21:03 (-0700), Mark D. Baushke wrote: ] > Subject: Re: CVS corrupts binary files ... > > In my view, CVS was designed to add a model of > concurrent modification and automatic merges on > top of the previously existing Revision Control > System representation of fi

RE: CVS corrupts binary files ...

2004-06-17 Thread Greg A. Woods
[ On Wednesday, June 9, 2004 at 09:15:24 (-0400), Jim.Hyslop wrote: ] > Subject: RE: CVS corrupts binary files ... > > Let's not throw the baby out with the bathwater, shall we? Granted, CVS was > not *originally* designed to handle binary files. Granted, CVS does not > handle binary files as well

Re: CVS corrupts binary files ...

2004-06-17 Thread Greg A. Woods
[ On Wednesday, June 9, 2004 at 09:35:37 (-0400), Tom Copeland wrote: ] > Subject: Re: CVS corrupts binary files ... > > On Tue, 2004-06-08 at 17:42, Paul Sander wrote: > > Keep in mind also that there's a difference between "binary files" and > > "mergeable files". > > That's a neat point. Wel

Re: CVS corrupts binary files ...

2004-06-17 Thread Tom Copeland
On Thu, 2004-06-17 at 16:12, Greg A. Woods wrote: > > Most of my Java projects use 3rd party jar files, > > which are compressed tar balls, more or less. And I certainly don't > > want to try to merge foolib-0.1.jar with foolib-0.2.jar when a new > > version comes out; I just want to put it in CV

Re: CVS corrupts binary files ...

2004-06-17 Thread Paul Sander
>--- Forwarded mail from [EMAIL PROTECTED] >[ On Tuesday, June 8, 2004 at 16:21:03 (-0700), Mark D. Baushke wrote: ] >> Subject: Re: CVS corrupts binary files ... >> It may be that the diff3 algorithm is not always >> the best one suited to do such mergers. >That may be true, but the use of t

RE: CVS corrupts binary files ...

2004-06-17 Thread Paul Sander
>--- Forwarded mail from [EMAIL PROTECTED] >[ On Wednesday, June 9, 2004 at 09:15:24 (-0400), Jim.Hyslop wrote: ] >> Subject: RE: CVS corrupts binary files ... >> >> Let's not throw the baby out with the bathwater, shall we? Granted, CVS was >> not *originally* designed to handle binary files. Gr

Re: CVS corrupts binary files ...

2004-06-17 Thread Eric Gorr
At 4:02 PM -0400 6/17/04, Greg A. Woods wrote: People just need to learn to use the right tool for the job and to quit being so bloody narrow minded when it comes to learning about new tools. First, I do not claim to have anything resembling expert (or even mediocre) knowledge in the usage of CVS

Re: CVS corrupts binary files ...

2004-06-17 Thread Paul Sander
>--- Forwarded mail from [EMAIL PROTECTED] >At 4:02 PM -0400 6/17/04, Greg A. Woods wrote: >I have no problem using/learning new tools. I'd personally love to be >able to use VooDoo for version control, but there are two problems: >1. It's not free >2. There is no standalone client for it >3. T

RE: CVS corrupts binary files ...

2004-06-17 Thread Jim.Hyslop
Greg A. Woods wrote: > [ On Wednesday, June 9, 2004 at 09:15:24 (-0400), Jim.Hyslop wrote: ] > > Subject: RE: CVS corrupts binary files ... > > > > Let's not throw the baby out with the bathwater, shall we? Granted, > > CVS was not *originally* designed to handle binary files. > Granted, CVS >

Re: CVS corrupts binary files ...

2004-06-17 Thread Eric Gorr
At 1:40 PM -0700 6/17/04, Paul Sander wrote: >Why would it not work well to use a CVS Wrapper to binhex (uuencode, etc.) a binary file and then essentially have CVS to only see your file as a text file? The key is that there's a distinction between text files and mergeable files. Programs like bi

RE: cvs merging - conflict

2004-06-17 Thread Jim.Hyslop
work (Rick) wrote: > Jim Hyslop pointed out that my confidential message wouldn't > allow a reply so I setup a different mailbox for the list > that doesn't contain such restrictions. This is a repeat of > my eariler message. Thanks, Rick, and sorry to be so nit-picky. I did see some email ex

Re: newbie question on initializing repository

2004-06-17 Thread Bret A Cooper
Chris, I've had some issues with my email so I'm just now seeing your response. Thanks for taking the time to write up the shell script.  Looks like a nice way to do it.  I guess it boils down to whether its possible to determine the type of a file from its name.  Though as I think about it,  I c

Re: CVS corrupts binary files ...

2004-06-17 Thread Greg A. Woods
[ On Thursday, June 17, 2004 at 16:25:02 (-0400), Tom Copeland wrote: ] > Subject: Re: CVS corrupts binary files ... > > Hm. Why not simply check these jar files into the repository where they > can be tagged/branched/exported and so forth? Why should every > programmer on my team need to get all

Re: CVS corrupts binary files ...

2004-06-17 Thread Greg A. Woods
[ On Thursday, June 17, 2004 at 13:06:44 (-0700), Paul Sander wrote: ] > Subject: Re: CVS corrupts binary files ... > > Current releases of CVS do the latter. (Don't believe me? Look at > the function named RCS_merge in the rcscmds.c source file.) It's a > simple matter to replace the invocation

RE: CVS corrupts binary files ...

2004-06-17 Thread Greg A. Woods
[ On Thursday, June 17, 2004 at 13:09:09 (-0700), Paul Sander wrote: ] > Subject: RE: CVS corrupts binary files ... > > I've done revision control by backup, and I've done revision control > by naming convention. Both have proven to be disasters. Obviously you tried to use these tehniques in isol

Re: CVS corrupts binary files ...

2004-06-17 Thread Greg A. Woods
[ On Thursday, June 17, 2004 at 17:03:34 (-0400), Eric Gorr wrote: ] > Subject: Re: CVS corrupts binary files ... > > #1 is, of course, a very compelling reason to use any piece of > software that works. Can you point to an alternative to CVS that is > also free? Check the various FAQs related t

Re: CVS corrupts binary files ...

2004-06-17 Thread Paul Sander
>--- Forwarded mail from [EMAIL PROTECTED] >At 1:40 PM -0700 6/17/04, Paul Sander wrote: >> >Why would it not work well to use a CVS Wrapper to binhex (uuencode, >>>etc.) a binary file and then essentially have CVS to only see your >>>file as a text file? >> >>The key is that there's a distinctio

RE: CVS corrupts binary files ...

2004-06-17 Thread Paul Sander
>--- Forwarded mail from [EMAIL PROTECTED] >[ On Thursday, June 17, 2004 at 13:09:09 (-0700), Paul Sander wrote: ] >> Subject: RE: CVS corrupts binary files ... >> >> I've done revision control by backup, and I've done revision control >> by naming convention. Both have proven to be disasters. >

Re: CVS corrupts binary files ...

2004-06-17 Thread Doug Lee
Responding above rather than below largely because my comments are general thoughts on the whole discussion... There is wisdom in choosing the right tool for a job. There is also wisdom in making the best use of the tools you already know and have. Both can be taken to unpleasant extremes. I bel

Re: CVS corrupts binary files ...

2004-06-17 Thread Mark D. Baushke
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Eric Gorr <[EMAIL PROTECTED]> writes: > Can you point to an alternative to CVS that is also free? Certainly. There are a number of such programs. Here are the Open Source and/or Free Software Source or configuration management programs: Aegis

Smoke, FUD (was Re: CVS corrupts binary files ...)

2004-06-17 Thread Paul Sander
Whew, the smoke's getting thick in here! >From: [EMAIL PROTECTED] >[ On Thursday, June 17, 2004 at 13:06:44 (-0700), Paul Sander wrote: ] >> Subject: Re: CVS corrupts binary files ... >> >> Current releases of CVS do the latter. (Don't believe me? Look at >> the function named RCS_merge in the

when cvs repository

2004-06-17 Thread Fabian Braennstroem
Hello, right now I am using cvs just for my programming part and I am curious for what else I could need it on my linux. Do you have any suggestions? I read that some even put there whole '/etc'-directory under cvs. Can you recommend this? Best Greetings! -- Fabian Braennstroem Duesseldorf/Berli

Wanted: Help Specifying CVSROOT

2004-06-17 Thread Siegfried Heintze
I'm going nuts trying to understand the syntax for specifying CVSROOT for a windows server! I have created a repository and used CVSNT service control panel to add the repository C:\CONVEX. (The documentation did not mention this, but it seemed like a good idea). I've tried using cygwin BASH