Re: problem with remotehost

2001-07-14 Thread David Zaroski
On Wed, 11 Jul 2001, krishna rama wrote: kr> I was run this command "cvs -d kr>:pserver:prasadm@tsl:/usr/local/newrepos login".Before kr>run this command I was set all instructions whatever kr>mentioned in the documentation.we geting an error kr>"connection refused.".After that I was fou

Re: Problem with multiple merges from trunk to tree (and much more. :-)

2001-07-14 Thread Greg A. Woods
[ On , July 14, 2001 at 22:07:00 (+0200), Garvin Hicking wrote: ] > Subject: Problem with multiple merges from trunk to tree (and much more. :-) > > [1] Requirements: > * Maintain a development line, and a final line > * Easy to export the production version of the project via a never- >chan

Re: How well does CVS handle other types of data?

2001-07-14 Thread Greg A. Woods
[ On Saturday, July 14, 2001 at 14:34:42 (-0700), Mike Castle wrote: ] > Subject: Re: How well does CVS handle other types of data? > > What bug? > > CVS used to scan the contents of the conflict file to see if it had been > fixed. But that was changed to the current method. Do you consider tha

Re: Disallowing commits in presence of conflict markers

2001-07-14 Thread Greg A. Woods
[ On Saturday, July 14, 2001 at 13:25:37 (-0700), Paul Sander wrote: ] > Subject: Disallowing commits in presence of conflict markers > > But my question remains: "What if the language provides no way to > do this?" Given this context, you have a file that simply cannot be > version-controlled b

Fwd: Re: pvcs to cvs and magic branches

2001-07-14 Thread Jim Gallagher
Basically, my changes to the script fixed the part that was breaking on my archives, but the changes broke other parts (including this one.) I can fix it OK, but I hate working on code whose purpose I don't understand. Thanks for the replys, Jim > But then, why expend all this extra effort to

Re: How well does CVS handle other types of data?

2001-07-14 Thread Mike Castle
On Sat, Jul 14, 2001 at 03:48:25PM -0400, Greg A. Woods wrote: > [ On Saturday, July 14, 2001 at 11:52:48 (-0700), Mike Castle wrote: ] > > Subject: Re: How well does CVS handle other types of data? > > > > Except that CVS doesn't continue to detect conflicts. A simple touch(1) of > > the file is

Problem with multiple merges from trunk to tree (and much more. :-)

2001-07-14 Thread Garvin Hicking
Hi! (Warning: Detailed Vehicle Ahead - skip all ">" and "|"-lines or proceed to the last 10 lines of my posting, if this is too much overhead for you. And, this is a so-to-say addon for ony of my previous posting 'how to structure my project?' :-) I'm having difficulties tagging files an

Disallowing commits in presence of conflict markers (was Re: How well does CVS handle other types of data?)

2001-07-14 Thread Paul Sander
>--- Forwarded mail from [EMAIL PROTECTED] >[ On Saturday, July 14, 2001 at 01:28:12 (-0700), Paul Sander wrote: ] >> Subject: Re: How well does CVS handle other types of data? >> >> And just how is this done? Do you use artifacts of the programming language >> to somehow format the marker into

Re: How well does CVS handle other types of data?

2001-07-14 Thread Greg A. Woods
[ On Saturday, July 14, 2001 at 11:52:48 (-0700), Mike Castle wrote: ] > Subject: Re: How well does CVS handle other types of data? > > Except that CVS doesn't continue to detect conflicts. A simple touch(1) of > the file is sufficient to mark the file as "fixed." And that will work on > any fil

Re: How well does CVS handle other types of data?

2001-07-14 Thread Mike Castle
On Sat, Jul 14, 2001 at 02:07:58PM -0400, Greg A. Woods wrote: > > The existing warning of a conflict during the merge is sufficient to > > alert the user to a possible problem. > > No, it is not. The initial warning is only just that -- an initial > warning. CVS must now continue to detect tha

Re: How well does CVS handle other types of data?

2001-07-14 Thread Greg A. Woods
[ On Friday, July 13, 2001 at 21:19:06 (-0700), Paul Sander wrote: ] > Subject: Re: How well does CVS handle other types of data? > > The existing CVS user model can be maintained without change, even if the > merge tool is swapped out with another, such as the trivial selection I > suggested. Yo

Re: How well does CVS handle other types of data?

2001-07-14 Thread Greg A. [EMAIL PROTECTED] (Greg A. Woods)
[ On Saturday, July 14, 2001 at 01:28:12 (-0700), Paul Sander wrote: ] > Subject: Re: How well does CVS handle other types of data? > > And just how is this done? Do you use artifacts of the programming language > to somehow format the marker into something that is not detectable by CVS? > What i

Re: cvs add question

2001-07-14 Thread John Lash
Eric & Rajesh, thanks for the reply. Here are some of my reasons for abusing CVS ;-). What I'd like to be able to do is pull a branch off of the trunk, or another branch, at some stable point (MYLABEL) and start working. I may be on this branch for a while and would like to keep up with the trun

RE: reserved checkouts in CVS (Was: How well does CVS handle other types of data?)

2001-07-14 Thread Noel L Yap
Can someone add http://sourceforge.net/tracker/index.php?func=detail&aid=422733&group_id=4680&atid=304680 to this page, please? This patch originated from the work done by Eric Griswold and Jim Kingdon but without any of the shortcomings. Thanks, Noel |+---> |

Re: How well does CVS handle other types of data?

2001-07-14 Thread Paul Sander
>--- Forwarded mail from [EMAIL PROTECTED] >[ On Friday, July 13, 2001 at 20:19:13 (-0700), Paul Sander wrote: ] >> Subject: Re: How well does CVS handle other types of data? >> >> I hope your hack doesn't make it into the general distribution. The >> comment makes total sense. The authors have