On Tue, Jun 01, 2004 at 01:35:22PM -0700, Tyler wrote:
> We've been working on two branches for several months: the trunk (our
> good pal HEAD) and the release branch (RELEASE).
>
> Initially, the plan was for developers to make any needed changes to
> both HEAD and RELEASE. RELEASE would eventual
We've been working on two branches for several months: the trunk (our
good pal HEAD) and the release branch (RELEASE).
Initially, the plan was for developers to make any needed changes to
both HEAD and RELEASE. RELEASE would eventually be released, while HEAD
would be the development branch, from
tkCVS (or the like) is an excellent tool to resolve conflicts...
-chris
-Original Message-
From: [EMAIL PROTECTED]
[mailto:[EMAIL PROTECTED] On
Behalf Of Urban Gabor
Sent: Tuesday, June 01, 2004 10:53 AM
To: [EMAIL PROTECTED]
Subject: Branch/merge question
Hi,
I have a rather speci
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Conrad T. Pino wrote:
>The new site is using an HTTPS SSL certificate issued
>by itself so Internet Explorer is throwing up warning
>because it's not a known certificate authority.
Folks at Collab are working on this.
>We don't have a ":pserver:" s
Hi,
I have a rather specific issue here:
Suppose we have created a branch for a development in our
module called branch_A for a longer time. During the
development we have decided to intagrate all changes on the
main branch into branch_A (and we have tagged both the
main/HEAD and the branch). Aft
Ramanuj Singh wrote:
> To get information about tags and branches created by a particular
> > user, I am giving the command
> > cvs history -T -u username
> > But not getting report on all the tags.
> > The -T option is used for generating report on all tags but
> it is not
> > display all the
To get information about
tags and branches created by a particular
> user, I am giving the
command
> cvs history -T -u
username
> But not getting report
on all the tags.
> The -T option is used
for generating report on all tags but it is not
> display all the tags
and branches crea
Lukasz Indyk wrote:
i have a problem with "cvs checkout: move away ... it is in the way"
warrning. this is the situation when it occurs (HTMLGenerator is one o my
modules that i put in cvs):
cvs login # i use pserver through inetd
cvs co HTMLGenerator# everything i
hello
i have a problem with "cvs checkout: move away ... it is in the way"
warrning. this is the situation when it occurs (HTMLGenerator is one o my
modules that i put in cvs):
cvs login # i use pserver through inetd
cvs co HTMLGenerator# everything is ok, i also
