CVS update -j branch-tag failes to merge

I have a CVS module (named ldas) where I would like to merge the contents of a branch into the trunk. According to the documentation, is seems that I should be able to du this using cvs update -j branch-tag. However, this does not work. No merging takes place, the files on the trunk do not

Re: CVS update -j branch-tag failes to merge

On Fri, May 13, 2005 at 10:04:59AM +0200, Asbjørn Sæbø wrote: I have a CVS module (named ldas) where I would like to merge the contents of a branch into the trunk. According to the documentation, is seems that I should be able to du this using cvs update -j branch-tag. However, this does not

Re: watch on dir

--- Jim Hyslop [EMAIL PROTECTED] escribió: Pedro Hernandez wrote: Hello folks! cvs 1.11.20 on Whitebox Linux 3 I'm trying to make a directory watched by default, reading in Cederqvist Command: cvs watch on [-lR] [files]... ... Is this a bug in cvs, the doc or in my head?

Re: Terminated with fatal signal 11

Dear Mark, Thank you for your precious informations. I Download the gdb package and used it as you tell me. bt showed 3 functions including re_search After downloading the cvs sources, I could locate them in the lib directory. So the problem was internal to cvs. I reinstalled it from sources

Questions on pserver authentication

I am trying to determine how pserver authentication works. I understand when you do a cvs login that it creates ~/.cvspass file. Therefore, I'm guessing that whenever you are running cvs commands cvs blindly combines the USER from whichever method wins (either using the pserver info found in

Re: CVS update -j branch-tag failes to merge

Asbjørn Sæbø wrote: On Fri, May 13, 2005 at 10:04:59AM +0200, Asbjørn Sæbø wrote: I have a CVS module (named ldas) where I would like to merge the contents of a branch into the trunk. According to the documentation, is seems that I should be able to du this using cvs update -j branch-tag.

Re: Questions on pserver authentication

Todd Foster wrote: I am trying to determine how pserver authentication works. I understand when you do a cvs login that it creates ~/.cvspass file. Therefore, I'm guessing that whenever you are running cvs commands cvs blindly combines the USER from whichever method wins (either using the

Re: Restoring deleted revisions (was: Branch Numbers)

Hridyesh Pant wrote: Hi Jim, I need ur help,some how i deleted 1.1 revision of some files.can i restore this revision. The only way to actually delete a revision of a file is using the 'cvs admin -o' command. There is no way to undo that action, except by restoring the repository file from your

Re: Questions on pserver authentication

Todd Foster writes: I am trying to determine how pserver authentication works. I understand when you do a cvs login that it creates ~/.cvspass file. Therefore, I'm guessing that whenever you are running cvs commands cvs blindly combines the USER from whichever method wins (either using

Re: Questions on pserver authentication

Thanks Larry, that sounds like what we need to do for our environment. I just want to make sure I understand what the CVSROOT would look like without the user name. Old: :pserver:[EMAIL PROTECTED]:/proj/cvsroot New: :pserver:/proj/cvsroot OR :pserver::/peroj/cvsroot Do you need to have extra