As the commit error message and status command suggests, when you merged
file into the trunk, it resulted into some conflicts. You need to
resolve those before you commit.
May be cvsnt mailing list will give you more relevent answer.
-Rohan
Nishad wrote:
After merging a branch to the main trunk
> "Jim" == Jim Hyslop writes:
Jim> To: "'ramanuj singh'" <[EMAIL PROTECTED]>, [EMAIL PROTECTED]
Jim> Subject: RE: cvs branch date
Jim> Date: Thu, 19 Aug 2004 10:16:41 -0400
>> ramanuj singh wrote:
>> How can we get the date of branch created through tag command or using
>> Tortois
[ On Wednesday, August 18, 2004 at 19:03:12 (-0700), Paul Sander wrote: ]
> Subject: Re: Why's it a sandbox?
>
> And then there are sandboxes of the house cat variety...
I don't think I've ever heard before of anyone putting sand in a litter
box (for cats or any other household critters), but of c
--- Forwarded mail from [EMAIL PROTECTED]
>> That's why some people call them "playpens" instead. :-)
>Oh, so now we're toddlers who can't even be trusted with sharp instruments.
>Hmmm ;-)
Surrounded by nets, noisemakers, and things to pound on...
--- End of forwarded message from [EMAIL PR
After merging a branch to the main trunk, I am unable to commit
some files. I got the following error while trying to commit the file.
(This is happening only to the new files created in the branch and
Generated in the working folder after the merge process.)
cvs commit -m "Merged from brach_b on
Gaurav Vaish wrote:
No, all are with 775. But still, cvs (client) reports the error about
"permission denied".
If subdirectories are being created with more restrictive permissions,
it means that you forgot to turn on the setgid bit in their
parent's permissions.
I think you will find this to be y
No, all are with 775. But still, cvs (client) reports the error about
"permission denied".
Cheers,
Gaurav
On Wed, 18 Aug 2004 00:36:55 + (UTC), Pierre Asselin
<[EMAIL PROTECTED]> wrote:
> Gaurav Vaish <[EMAIL PROTECTED]> wrote:
>
> > I am using pserver to connect and more often than not,
ramanuj singh wrote:
> How can we get the date of branch created through tag command or
> using Tortoise CVS utility on windows.
> I know we cand get creation date of tag or branch from cvs history
> command on command promt but it gives the report only on tags and
> branches created throu
[EMAIL PROTECTED] wrote:
> And then there are sandboxes of the house cat variety...
Ick, never thought of that connotation. Although, considering the quality of
some code I've seen, it can be appropriate...
> That's why some people call them "playpens" instead. :-)
Oh, so now we're toddlers who c
Jim,
Quite a number of the questions on this list are from users like yourself with WinCVS
or TortoiseCVS who don't realise they have CVSNT.
CVSNT uses additional metadata stored in the client CVS folder that CVS (cvshome) does
not know about. This is to support the additional features of CVSN
Hi Arthur
I hope cvshome people will not mind a quick discussion, too much, on an
alternative product as it is relevant to this thread.
>From: "Arthur Barrett" <[EMAIL PROTECTED]>
>Using a sandpit with CVS (cvshome) and CVSNT clients is dangerous
>and not supported. Since CVSNT is available for
How can we get the date of branch created through tag command or
using Tortoise CVS utility on windows.
I know we cand get creation date of tag or branch from cvs history
command on command promt but it gives the report only on tags and
branches created through cvs rtag command.
Thanks in ad
Ramanuj,
If you are using TortoiseCVS on the client then you are probably using CVSNT.
http://www.cvsnt.com
However on Linux you may be using either CVS or CVSNT (CVSNT is also GNU/GPL and runs
on Linux/Windows/Mac/Unix etc).
Your description of the problem is a little difficult to follow. Cou
Please send mail only in Plain Text format.
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 been changed earlier or updated in the development branch gets
updated with the changes from the branc
14 matches
Mail list logo
