Aha.. I misunderstood the concept of empty directories. Thank you for your
help!
-Thomas
-Opprinnelig melding-
Fra: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
Sendt: 05. desember 2000 19:47
Til: [EMAIL PROTECTED]
Kopi: [EMAIL PROTECTED]
Emne: Re: Cvs checkout contains empty directories
Greetings, all.
I'm trying to come up with a better model for managing merges and branches
than that which we currently use with our CVS repository at work.
First, a brief description of the structure of our working area. We're
working on a single software system which consists of a number of
e
I have just started implementing CVS for our software project. Firstly
I like to thank everybody
who was involved in writing CVS and making it available for everyone to
use. It is not only very
easy to set up but also easy to use and maintain. I just have one small
question that I am confused
abou
One point I forgot to mention in my previous post:
I wrote:
> When a new branch is to be created (when development on a
> new release is to begin) the current newest branch is
> merged to the trunk, then the new branch is created off
> the trunk.
What I forgot to mention was that since no d
One of the folks in my group has decided he wants to change the name
of a branch tag, after having done some amount of changing of files on
that branch. I'd never heard of a way to do that, and a scan of the
docs doesn't reveal anything that looks like a facility for doing
that, but I figured it
Is there any way to stop CVS from always trying to merge your code?
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
cvs rtag -r -b module.
I then would do a merge into the new branch from the old branch.
Or alternately. Create a new branch from the latest of the old
branch and just start using the new branch name.
donald
On Wed, Dec 06, 2000 at 10:42:54AM -0500, John R. Dunning wrote:
> One of the folks i
John,
To rename an existing tag (not a branch tag) you should be able to:
cvs rtag -r existing_tag new_tag module
cvs rtag -d existing_tag module
However, this does not work with a branch tag unless you use
the -r number instead of name.
Since each file in a branch tag would have different branch
On Wed, Dec 06, 2000 at 10:42:54AM -0500, John R. Dunning wrote:
> that, but I figured it was worth asking the list: Is there a way to
> change the name of an existing branch tag?
No.
You could create another branch from the same branch point (you did create
a regular tag at the same point, rig
On Wed, Dec 06, 2000 at 11:16:09AM -0500, Largent, Jim wrote:
> Is there any way to stop CVS from always trying to merge your code?
Why would you want to do that? (serious question, what are you trying to
accomplish?)
I can think of two things:
You don't want to keep your changes.
You don't w
John,
After I made the change in my example below, I went back to work
with the file and in my work area I now get
cvs server: conflict: SDHSU/isreplace/ids/Make.defs is modified
but no longer in the repository
C SDHSU/isreplace/ids/Make.defs
when doing a "cvs update" on the file.
Warning: you
On Wed, Dec 06, 2000 at 07:55:51AM -0600, Richard Cobbe wrote:
> is going to cause a lot of conflicts. (We could avoid these by being
> clever with tags and doing many separate merge commands, but that's rather
> a hassle.) In addition, this makes it very difficult to continue
> development on t
When I use the following command:
cvs -d :pserver:stephen@vancouver:/ash/cvsroot co /tgx/3rdparty/exim
I get the following error:
cvs server: warning: cannot make directory CVS in /: Permission denied
cvs [server aborted]: cannot make directory /tgx: No such file or
directory
Shouldn't it be
Donald,
I believe your answer will force a new branch off the old branch
instead of giving another branch name pointing to the same
old branch point.
Dale Miller
Donald Sharp wrote:
> cvs rtag -r -b module.
>
> I then would do a merge into the new branch from the old branch.
>
> Or alternate
Stephen Rasku wrote:
> cvs -d :pserver:stephen@vancouver:/ash/cvsroot co /tgx/3rdparty/exim
Oopsie; you said "/tgx..." instead of "tgx...". The argument to
co/checkout is relative to the last component of the cvsroot specified
as an argument to the -d parameter.
Cheers,
Laird
--
W: [EMAIL PROT
John Dunning wrote:
>
>One of the folks in my group has decided he wants to change the name
>of a branch tag, after having done some amount of changing of files
on
>that branch. I'd never heard of a way to do that, and a scan of the
>docs doesn't reveal anything that looks like a facility for do
I had been using loginfo to keep our internal web server up to date.
The web server had access to an NFS directory where the HTML files
were checked out so it was easy.
We have now moved our web server to our firewall and we don't want to
mount NFS directories. Is there still a way to do thi
Mike Castle wrote:
>
-snip-
> If you need to commit and others have changed the file too, and you are
> certain, VERY VERY CERTAIN that you don't want those changes, then rename
> your file, cvs update, copy your renamed file over the file just checked
> out, then commit. THIS WILL LOSE CHANGES!
In the future, please keep emails of this nature on the info-cvs list. You are
much more likely to get a prompt response.
Anyhow, I didn't mean that you wouldn't be able to access old revisions. What
I meant was that moving files and directories around could break your makefiles
and maybe other
Padma CHini wrote:
> Hi
> I am totally new to CVS.I want to know how one can
> enforce a tag naming convention?I know it can be done
> thro' taginfo file,but I am not sure about the script
> it should invoke.Where should I give the pattern which
> I want my tags to conform to?It is not clear in t
Stephen,
Thank you. The cvs admin -n command does work as desired.
(I tested it with my previous test case).
Dale Miller
Stephen Rasku wrote:
> John Dunning wrote:
> >
> >One of the folks in my group has decided he wants to change the name
> >of a branch tag, after having done some amount of
Lan Barnes wrote:
> Mike Castle wrote:
> > If you need to commit and others have changed the file too, and you are
> > certain, VERY VERY CERTAIN that you don't want those changes, then rename
> > your file, cvs update, copy your renamed file over the file just checked
> > out, then commit. THIS
True, but merges would find the same common ancestor for both branches, so
the point is moot. Of course, you would still have to worry about other
developers still having the branch checked out under the old name and
committing to the old branch rather than the new one.
Derek
--
Derek Price
Stephen Rasku wrote:
> I had been using loginfo to keep our internal web server up to date.
> The web server had access to an NFS directory where the HTML files
> were checked out so it was easy.
>
> We have now moved our web server to our firewall and we don't want to
> mount NFS directories. I
"Derek R. Price" wrote:
> My ssh installation come with an "scp" program to transfer files. You
> could probably do a checkout and use something like rdist or rsynch too.
Er, s/rsynch/rsync/g.
Derek
--
Derek Price CVS Solutions Architect ( http://CVSHome.org )
mailto:[EMA
Tomas Velek wrote:
> Hello,
> I want to inform other about commit. To do it I use the "notify"
> file and the external file, which send the informative mail to people
> in "users" file. After commit all people receive the mail, it is
> right. But this mail must contains the names of commited fi
"Derek R. Price" wrote:
> There have been a few discussions lately about this kind of thing as
> well, including one that suggested always providing all available
> information for a hook in environment variables, similar to CGI, but I'm
> not sure now that this patch isn't a better solution since
On Wed, Dec 06, 2000 at 02:08:23PM -0600, Brett Neumeier wrote:
> Yes; that would be more accurate. Changes are not being lost; they
> are just being removed from the head revision.
But how soon will you notice this?
This should definitely be the exception, not the rule.
If this is happening
Hi all,
Due to an application which is incapable of ignoring CVS directories, I
have a need to 'hide' the /CVS/ directories in my development source
tree. I'm wondering if there is a CVS setting which I could use to put
the /CVS/ directories into another location (i.e. a directory structure
whic
Hi all,
Can someone tell me how to set up mail aliases in CVS?
I need to create mail aliases;each alias will have all the people in
one module so that on commits those people only will get email.How
can this be accomplished in the loginfo file or is it the notify file?
Thanks,
Paddy Thomas
_
Ken Versteeg <[EMAIL PROTECTED]> wrote:
> Due to an application which is incapable of ignoring CVS directories, I
> have a need to 'hide' the /CVS/ directories in my development source
> tree. I'm wondering if there is a CVS setting which I could use to put
> the /CVS/ directories into another lo
I believe 'cvs export' does not create these directories.
Maybe you can use that?
-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]On Behalf Of
Ken Versteeg
Sent: Wednesday, December 06, 2000 6:44 PM
To: [EMAIL PROTECTED]
Subject: location of /CVS/ directories
Hi all
I use the 'mail' command from 'notify' and the /etc/aliases file (Linux)
does the rest. To see the doc, just 'man aliases'.
-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]On Behalf Of
[EMAIL PROTECTED]
Sent: Wednesday, December 06, 2000 8:51 PM
To: [EMAIL PROTECTED]
Richard Cobbe wrote that he wanted suggestions about merging...
I can tell you what we do, and you can see if it might make sense
for you.
We do all development and bugfixes on branches. We don't really use
the trunk for any development at all. We have "official" branches that
everybody knows
Richard Cobbe wrote:
> Greetings, all.
>
> I'm trying to come up with a better model for managing merges and branches
> than that which we currently use with our CVS repository at work.
>
> First, a brief description of the structure of our working area. We're
> working on a single software syst
35 matches
Mail list logo
