RE: CVS update -j problem with merging directories.

2004-02-05 Thread Viraj Purang
Thanks for the suggestion. It worked for me. Very prompt response. Regards, Viraj Purang -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Sent: Thursday, February 05, 2004 2:13 PM To: [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] Subject: Re: CVS update -j problem with mergi

Re: CVS update -j problem with merging directories.

2004-02-05 Thread Larry Jones
Viraj Purang writes: > > The merge seems to be okay for most of the files, > except the 2 new directories > which were added to main and "r56b0" > between "build15" and "build20" tags. You need to use update -d to get new directories. -Larry Jones Nobody knows how to pamper like a Mom. -- C

CVS update -j problem with merging directories.

2004-02-05 Thread Viraj Purang
I have 2 branches "r56b0" and "r56b0_branch_demo" other than the "main". "r56b0_branch_demo" was branched off from "r56b0" at tag id : "build15". "r56b0" is now at a tag level "build20". I merged changes made between "build15" to "build20" on "r56b0" into "r56b0_branch_demo" using "cvs upd

cvs history with -r

2004-02-05 Thread Murugaiyan, Natarajan [IT]
I want to get a report which lists all files and revisions that were committed on a branch since the branch was branched. The cvs command I am using is cvs history -c -p btec -a -r S8PHASE1 This command lists revisions committed on branch S8PHASE1 on module btec, but also lists revisio

chrooted-ssh-cvs question

2004-02-05 Thread Keyser Soze
I have implemented the solution as documented here: http://www.idealx.org/doc/chrooted-ssh-cvs-server.en.html I have a couple of questions and am hoping someone here can answer. 1) how do I create passwords for users in {base}/{project}/chrooted/etc/passwd? Do I use passwd and then copy the te

Re: Pserver command

2004-02-05 Thread Larry Jones
"RAJAGOPAL, AARTI (SBCSI)" writes: > > What version contains the bug fix? Actually, I misremembered -- not creating ~/.cvspass was a bug in 1.11.1 that was fixed in 1.11.2. 1.11.6 should have warned you that the file did not exist but then gone ahead and created it. Are you sure the *client* wa

Re: bug-cvs mailing list: is it dead?

2004-02-05 Thread Phil Richards
On 2004-02-02, Ed Avis <[EMAIL PROTECTED]> wrote: > Hmm so does this mean a mailing list can have an undead existence on > Gmane after the list server has stopped working? So articles posted > on Gmane go directly into the group, they don't have to make a round > trip via the mailing list. Yu

RE: Pserver command

2004-02-05 Thread RAJAGOPAL, AARTI (SBCSI)
What version contains the bug fix? -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Sent: Thursday, February 05, 2004 10:39 AM To: RAJAGOPAL, AARTI (SBCSI) Cc: [EMAIL PROTECTED]; [EMAIL PROTECTED] Subject: Re: Pserver command "RAJAGOPAL, AARTI (SBCSI)" writes: > > W

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: Best Practices enquiry

2004-02-05 Thread Paul Sander
>--- Forwarded mail from [EMAIL PROTECTED] >[EMAIL PROTECTED] wrote: >> The bad part is that you need to know in advance what you're going to >> change in persuit of the bug fix, so that it can be tagged. >No, you don't. You just go ahead and make your changes for the bug fix. When >you're ready t

RE: Best Practices enquiry

2004-02-05 Thread Paul Sander
>--- Forwarded mail from [EMAIL PROTECTED] >>1- Merge the branch to the trunk each time a bug fix is done on >> the branch, resolving (an increasing number of) conflicts >> as they appear (no real need for merge tags in this case); or >Merge-as-you-go is the best approach. It minim

Re: Pserver command

2004-02-05 Thread Larry Jones
"RAJAGOPAL, AARTI (SBCSI)" writes: > > We are using CVS 1.11.6. Normally isn't the .cvspass created by CVS? Or is > this is a bug in this version? Has it been fixed in later versions? Thanks. Yes, yes, and yes. -Larry Jones There's a connection here, I just know it. -- Calvin

RE: Best Practices enquiry

2004-02-05 Thread Jim.Hyslop
Yannick Fortin wrote: >We currently have a rather standard setup. We have a > branch for the > stable, released version of our software where we only put > bug fixes and > minor improvements. All the development is made on the trunk (or > short-lived branches as needed). We are a few days

RE: Best Practices enquiry

2004-02-05 Thread Jim.Hyslop
[EMAIL PROTECTED] wrote: > The bad part is that you need to know in advance what you're going to > change in persuit of the bug fix, so that it can be tagged. No, you don't. You just go ahead and make your changes for the bug fix. When you're ready to check in, *then* you tag the files you've chang

Re: CVS question

2004-02-05 Thread Arno Schuring
See http://www.cvshome.org/docs/manual/cvs-1.11.10/cvs_18.html#SEC160 Add the following line to your CVSROOT/modules file: PackAPackA &PackB Hope this is what you are looking for Arno Schuring - Original Message - From: "Sophie Coon" <[EMAIL PROTECTED]> To: <[EMAIL PROTECTED]> Se

Commit Mac Bundles

2004-02-05 Thread Ayush Dwivedi
I am using Mac OS 10.2.1 and CVS Client 3.2.b10. I want to Commit Mac Bundles inside Mac CVS. If I add this file as Binary and checkout on my machine I do not get the bundle back. It is represented in a folder format. Same thing is got repeated when I use import. Kindly suggest ! Thanks Ayush Dwive