Cvs merge problem

Title: Cvs merge problem Hi, I m facing very strange problem.Developers are working on their branch made from a development branch on trunk. There are seven developers in the team. The problem developer facing is when their branch is merged in to the development branch the files which have bee

Re: Why's it a sandbox?

>--- Forwarded mail from [EMAIL PROTECTED] >On Wed, Aug 18, 2004 at 05:28:28PM -0400, Jim.Hyslop wrote: >> >> Why do people call these "sandboxes"? I'm a professional software developer, >> not a kid playing in the sand. >> >Hehehe...I think "sandbox" is a cool term and never thought of it as >

Re: Why's it a sandbox?

On Wed, Aug 18, 2004 at 05:28:28PM -0400, Jim.Hyslop wrote: > > Why do people call these "sandboxes"? I'm a professional software > developer, not a kid playing in the sand. > A search for "jargon sandbox" yeilds this result: sandbox: n. 1. (also `sandbox, the') Common term for the R&D

Re: Why's it a sandbox?

On Wed, Aug 18, 2004 at 05:28:28PM -0400, Jim.Hyslop wrote: > > Why do people call these "sandboxes"? I'm a professional software developer, > not a kid playing in the sand. > Hehehe...I think "sandbox" is a cool term and never thought of it as at all demeaning. "Sandpit," on the other hand, qu

RE: /#cvs.lock): No such file or directoryctory for

Jim, Apologies for not replying sooner - but I've been following the discussion closely and talking with our developers to ensure that I understand what our position on this issue is. You are using WinCVS which is a "front end" to CVSNT - CVSNT is the default client for WinCVS and TortoiseCVS.

Re: Connection reset by peer?

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hamid Ghassemi <[EMAIL PROTECTED]> writes: > The upgrade did not mess with any files. We are also using :pserver: to > connect to the server. > > Also we are using cvshome.org version of cvs. Hmmm Typically I have seen :pserver: with the "Conn

RE: Connection reset by peer?

The upgrade did not mess with any files. We are also using :pserver: to connect to the server. Also we are using cvshome.org version of cvs. --Hamid -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Mark D. Baushke Sent: Wednesday, August 18, 2004 3:36 PM

Re: Connection reset by peer?

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hamid Ghassemi <[EMAIL PROTECTED]> writes: > We seem to be getting the following error ever since upgrading to cvs > 1.11.17 > > >> Fetching directory src/com/foo/apps/util/sysstats > cvs [checkout aborted]: recv() from server peterpan.dev.ne

Connection reset by peer?

We seem to be getting the following error ever since upgrading to cvs 1.11.17 >> Fetching directory src/com/foo/apps/util/sysstats cvs [checkout aborted]: recv() from server peterpan.dev.net: Connection reset by peer We are using RedHat 7.1 for client running the same version of CVS and o

RE: change root of branch with new revision in trunk

Stins, Dick wrote: > BlankJim, > > Sorry about the rtf/mime mails. > > I guess that this one is allright? Yes, that's better, thanks. > All examples I have seen are merging the trunk with the branch. > My question is how to update the branch with the trunk. > > - I have a file a.txt revision 1

RE: /#cvs.lock): No such file or directoryctory for

Jim Page wrote: > What you are suggesting, and is also suggested in the above > postings, is > having 2 sandboxes, 1 linux and 1 windows, right? Are any of your developers working simultaneously on Windows and on Linux? If not, then only one working directory is needed. Why do people call these

Re: CVS Permissions

Gaurav Vaish <[EMAIL PROTECTED]> wrote: > I am using pserver to connect and more often than not, I get the > error - "Unable to create #cvs.lock, Permission denied". > The reason is that a module or a subdirectory thereof will be > created by the permission set of the permission who created i

Merging CVS archives ?

Hi ! I have a project under CVS control, that unfortunately is split between two actual CVS archives: - ARCHIVE1 contains the "old" part of the project. - At one point in time, ARCHIVE2 was created by taking the latest revisions of the files in ARCHIVE1 and importing them into ARCHIVE2. - Si

Re: Branching in a vendor branch

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi Jay, I believe you want to use cvs 1.12.9.1 as taken from the feature branch of the cvs.cvshome.org repository. It has a new feature for import which is the -X switch to make sure that vendor imports do not show up on the main trunk. See the threa

Re: /#cvs.lock): No such file or directoryctory for

>2. Re: /#cvs.lock): No such file or directoryctory fordirectory inrepository> (Frederic Brehm) >4. Re: /#cvs.lock): No such file or directoryctory fordirectory inrepository> (Geoff Beier) >6. Re: /#cvs.lock): No such file or directoryctory for >(Todd Denniston)

Re: CVS Permissions

Hi Arthur, I know of CVSNT on Windows for past 4yrs now. The only thing that I didn't know of was that it is now an integral part of WinCVS. In that case, I would safely assume that it is standard configuration. :-) Thanks for the mail. Cheers, Gaurav http://gallery.mastergaurav.net ---

Re: /#cvs.lock): No such file or directoryctory for

Frederic Brehm wrote: > Note that I second Fred's suggestion of branches for the way you work. > At 05:37 AM 8/18/2004, Jim Page - emailsystems.com wrote: > >I think I have expressed myself badly. Our developers are working on both > >windows and linux -at the same time-. Either with 2 dev boxes,

RE: change root of branch with new revision in trunk

Dick, can you re-post your messages as plain text, with MIME turned off? My mail reader converts your message to an attachment within an attachment, making it very difficult to read and reply to. -- Jim Hyslop Senior Software Designer Leitch Technology International Inc. (http://www.leitch.com

Re: /#cvs.lock): No such file or directoryctory for

Hi Jim, On 8/18/04 5:37 AM, "Jim Page - emailsystems.com" <[EMAIL PROTECTED]> wrote: > I think I have expressed myself badly. Our developers are working on both > windows and linux -at the same time-. Either with 2 dev boxes, or using > VMware to run the other OS, with a partition shared between

CVS commit problem

___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs

Re: /#cvs.lock): No such file or directoryctory for

At 05:37 AM 8/18/2004, Jim Page - emailsystems.com wrote: I think I have expressed myself badly. Our developers are working on both windows and linux -at the same time-. Either with 2 dev boxes, or using VMware to run the other OS, with a partition shared between the 2. What is being suggested here

Re: /#cvs.lock): No such file or directoryctory for

Hi Doug Thanks for your input. I think I hold a minority position here, but I would just like to add my comments in case I didn't communicate my position well and you misunderstood me. > > What you are suggesting, and is also suggested in the above postings, is > > having 2 sandboxes, 1 linux and

Re: [OT ?] *WIN*CVS setup questions

Hello, * On Wed, Aug 18, 2004 at 12:23:03AM -0700 New Bie 123 wrote: > :pserver:[EMAIL PROTECTED]:/cvsroot/freedos [...] > What are the following in the above : > --- > >>- Path > >>- Host address (IP / DNS name) I'm not sure if I understand you corre

RE: [OT ?] *WIN*CVS setup questions

Hi Thanks for the V quick reply. Really amazing speed from you. > >So the CVSROOT is :sserver:[EMAIL PROTECTED]:/usr/local/cvs > That solves the CVS root problem Next -- In a command cvs -d:pserver:[EMAIL PROTECTED]:/cvsroot/freedos login and cvs -z3 -d:pserver: