Re: cvs add problem: "protocol error: Malformed Entry"

2004-07-01 Thread Roger James
Has anyone got any further info on this problem.   I am also using cvs-1.11.1p1-332 on SuSE 8.1 and have just encountered the same problem. The server is only accessible locally and this is first time I have tried to import a new module since the patch was applied. The client is wincvs 1.3.17.2 Bet

Branch merging to main trunk

2004-07-01 Thread Christophe Delarue
Once a branch is created, bug are corrected on the branch and then merged into the main trunk. How do you deal with those merges : 1) On each release of the branch, done by the leader of the branch as describe in http://www.magic-cauldron.com/ using cvs update -j last_release -j new_release on

Re: update on remote working copy

2004-07-01 Thread Paulo Franzon
[EMAIL PROTECTED] (Larry Jones) wrote in message news:<[EMAIL PROTECTED]>... > That's what rsh and its modern, secure sibling, ssh are for. > > -Larry Jones > Yes, now I'm using plink to do that: first I commit to the repository and then use plink to perform a update on the sandbox of the web se

Does anyone Know this error?

2004-07-01 Thread Hugo Carvalho
When i try to login to cvs this error occurs: cvs [login aborted]: connect to cvs.apache.org(209.237.227.194):2401 failed: Connection refused Can anyone help me on this? Thanks a lot, Hugo. ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gn

RE: binary files bad idea? why?

2004-07-01 Thread Frederic Brehm
At 04:09 PM 6/30/2004, Eric Gorr wrote: So, I'm sorry...what can go wrong here? Merging. Start with your test repository. Checkout two different sandboxes. In one, make a change to one part of the NIB, binhex, and commit. In another, make a change to another part of the NIB, binhex, and update. Wha

Re: Branch merging to main trunk

2004-07-01 Thread Tyler
On Thu, Jul 01, 2004 at 08:35:54AM -0700, Christophe Delarue wrote: > Once a branch is created, bug are corrected on the branch and then > merged into the main trunk. > > How do you deal with those merges : > > 1) On each release of the branch, done by the leader of the branch as > describe in ht

modules file

2004-07-01 Thread Khyati Nayak
Can I specify regular expressions in a modules file? If yes, how so? Thanks Khyati___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs

Re: Bugs with CVS in Windows XP professionel

2004-07-01 Thread Larry Jones
[EMAIL PROTECTED] writes: > > C:\Documents and Settings\admmounir\Bureau>cvs add -kb -m "ee" raj.doc > cvs add: cannot open CVS/Entries for reading: No such file or directory > cvs [add aborted]: no repository You can only add files in a directory that you've checked out. -Larry Jones Another c

Re: Does anyone Know this error?

2004-07-01 Thread Larry Jones
Hugo Carvalho writes: > > cvs [login aborted]: connect to cvs.apache.org(209.237.227.194):2401 > failed: Connection refused -Larry Jones When I want an editorial, I'll ASK for it! -- Calvin __

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

2004-07-01 Thread Paul Sander
>--- Forwarded mail from [EMAIL PROTECTED] >[ On Monday, June 28, 2004 at 19:02:19 (-0700), Paul Sander wrote: ] >> Subject: Re: Smoke, FUD (was Re: CVS corrupts binary files ...) >> >> I have never, ever advocated changing the format of an RCS file in a >> way that would break the ci, co, rcs, or

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

2004-07-01 Thread Paul Sander
>--- Forwarded mail from [EMAIL PROTECTED] >[ On Monday, June 28, 2004 at 14:58:03 (-0700), Mark D. Baushke wrote: ] >> Subject: Re: Smoke, FUD (was Re: CVS corrupts binary files ...) >> >> Yes, but diff is not diff3. diff is used for the >> delta format. diff3 is used by rcsmerge, not for >> fun