Re: finding out the branch or tag date

[Eric Siegerman]

Only if it was created with "rtag"; "tag" doesn't write history
entries.

On Thu, Apr 11, 2002 at 11:38:16PM -0400, Danial Islam wrote:
> Should be:
> cvs history -T
> 
> brianpdoyle wrote:
> 
> > Once you have created a branch or a tag on a module is there a way to
> > find out the date and time that the branch was created? Thanks.

--

|  | /\
|-_|/  >   Eric Siegerman, Toronto, Ont.[EMAIL PROTECTED]
|  |  /
"Outlook not so good."  That magic 8-ball knows everything!
I'll ask about Exchange Server next.
- Anonymous

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: ViewCVS Problems

[Danial Islam]

Oh gosh... nevermind.  I realized you don't move the viewcvs.conf file into
your apache/conf directory (unlike cvsweb.conf)!  You configure viewcvs.conf
in the directory where viewcvs was installed.  I set up rcs_path and it
worked.

Danial.

Danial Islam wrote:

> Anyone tried using ViewCVS?
>
> I can't get mine to work properly.  It shows my directories but won't
> show the files. And it says, for example:
>
> "There are 75 files, but none match the current selection criteria."
>
> I am aware that sometimes this problem is due to the fact that rcs_path
> in viewcvs.conf is not set properly. But I have tried different paths to
> rcs as well as downloading and installing RCS 5.7 on my Solaris 5.8
> machine.  Still no luck.
>
> Danial.
>
> ___
> Info-cvs mailing list
> [EMAIL PROTECTED]
> http://mail.gnu.org/mailman/listinfo/info-cvs


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

ViewCVS Problems

[Danial Islam]

Anyone tried using ViewCVS?

I can't get mine to work properly.  It shows my directories but won't
show the files. And it says, for example:

"There are 75 files, but none match the current selection criteria."

I am aware that sometimes this problem is due to the fact that rcs_path
in viewcvs.conf is not set properly. But I have tried different paths to
rcs as well as downloading and installing RCS 5.7 on my Solaris 5.8
machine.  Still no luck.

Danial.


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

finding out the branch or tag date

[brianpdoyle]

Once you have created a branch or a tag on a module is there a way to 
find out the date and time that the branch was created? Thanks. 



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: finding out the branch or tag date

[Danial Islam]

Should be:
cvs history -T

brianpdoyle wrote:

> Once you have created a branch or a tag on a module is there a way to
> find out the date and time that the branch was created? Thanks.
>
> ___
> Info-cvs mailing list
> [EMAIL PROTECTED]
> http://mail.gnu.org/mailman/listinfo/info-cvs


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: CVS And Solaris

[Andrew Johnson]

Steve P wrote:
> 
>  ssh -l username host 'cvs'I get a "cvs:  command not found"

Look up the usage for and set the CVS_SERVER environment variable, which
allows you to specify the path to the cvs binary on a remote server.

- Andrew
-- 
Perfection is reached, not when there is no longer anything to add,
but when there is no longer anything to take away.
- Antoine de Saint-Exupery
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: Ampersand module question

[Jay Glanville]

"Pierre Asselin" <[EMAIL PROTECTED]> wrote in message
a92viq$oed$[EMAIL PROTECTED]">news:a92viq$oed$[EMAIL PROTECTED]...
> In  "Jay
Glanville" <[EMAIL PROTECTED]> writes:
>
> >Thanks Martin.  It's a good start, but not all that I was looking for.
By
> >using the "-d" option, what I'm doing is "front-loading" the naming
> >architecture.  In other words, anytime I use module amp1, it will be
under a
> >directory tools
>
> I create dummy modules for that purpose.  For example,
>
> amp1path/to/amp1
> amp2path/to/amp2
> _amp1   -d tools/amp1   path/to/amp1
> mod path/to/mod &_amp1 &2
>
> The convention is that a module beginning with an underscore is not
> meant to be checked out by itself --although nothing prevents you to.
>

Thanks Pierre.  This makes sense.

JDG


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

CVS And Solaris

[Steve P]

First of all, I would like to thank Mr. Knowles for his fine help with my
previous post.  I wish there was a way I could rate it.

Here's another scenario I need some help with:  At school, we have a Solaris
machine we do all of our schoolwork on, and, of course, it has CVS.  If I'm
at school (or communicating via SSH), I can check in / check out projects
from my cvs root on the Solaris machine to my Solaris account.

Here is where the problem comes in.  I have WinCVS set up here at home and I
want to be able to do the same thing.  I have SSH set up here and I use
WinCVS to communicate with a linux machine.  Again, no problems.  However,
when I try to use WinCVS to communicate with the Solaris machine, I get the
following error:  cvs [checkout aborted]: end of file encountered.  The
settings are the same for the Linux machine and the Solaris machine (of
course, the paths, etc. are different), but I still cannot access my
repository on Solaris.  If I do the following:

 ssh -l username host 'cvs'I get a "cvs:  command not found"

but, if I do the following:

 ssh -l username host 'ls'I get a list of my files.  This tells me
SSH is working correctly.

 My question:  Has anyone encountered anything like this before?  Is
there a way for the Solaris admin to disallow this kind of file transefers
from one machine to another (in other words, turn off "cvs" from external
machines)?  Is there a way to check?

 Thank you very much in advanced,

 Steve


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: inetd.conf problem

[Per Akesson]

Iqbal Shaikh wrote:

>
> Hi All,
>
> We  had  implemented a cvs  server on linux  6.2.
> We then faced the problem of  cvs repository  entries limitation
> in the  inetd.conf file.
>
> We have intentions of  having our cvs server installed on the Sun
> Solaris Machine.
> We have got  solaris 2.7 running on this machine.
>
> Just  want to know , if there will be similar limitations on
> inetd.conf  file
> on solaris2.7
> If there is then what could be the solution.

We encountered a command line limitation in inetd.conf on Solaris 2.7.

We solved by simply write a shell script with the cvs command line
and invoke the script from inetd.conf.

As in:

File: inetd.conf

cvspserver  stream  tcp nowait  root/usr/local/bin/cvs.inetd
cvs.inetd

and /usr/local/bin/cvs.inetd looks like:

#! /bin/sh
REPOS="--allow-root=/home/navtech/cvsroot \
 --allow-root=/home/sasfs/cvsroot \
 --allow-root=/home/spaceweb/cvsroot \
 --allow-root=/home/thf/cvsroot \
 --allow-root=/home/tlm/cvsroot"
/usr/local/bin/cvs $REPOS pserver


Works for us.

regards

--
Per Åkesson
Carmenta AB
SWEDEN



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: CVS And Solaris

[Neil Tardella]

Are you sure cvs is in your path?
try specifying the path: 
eg. ssh -l username host '/usr/local/bin/cvs' 
 
"Steve P" <[EMAIL PROTECTED]> wrote in message 
news:...
> First of all, I would like to thank Mr. Knowles for his fine help with my
> previous post.  I wish there was a way I could rate it.
> 
> Here's another scenario I need some help with:  At school, we have a Solaris
> machine we do all of our schoolwork on, and, of course, it has CVS.  If I'm
> at school (or communicating via SSH), I can check in / check out projects
> from my cvs root on the Solaris machine to my Solaris account.
> 
> Here is where the problem comes in.  I have WinCVS set up here at home and I
> want to be able to do the same thing.  I have SSH set up here and I use
> WinCVS to communicate with a linux machine.  Again, no problems.  However,
> when I try to use WinCVS to communicate with the Solaris machine, I get the
> following error:  cvs [checkout aborted]: end of file encountered.  The
> settings are the same for the Linux machine and the Solaris machine (of
> course, the paths, etc. are different), but I still cannot access my
> repository on Solaris.  If I do the following:
> 
>  ssh -l username host 'cvs'I get a "cvs:  command not found"
> 
> but, if I do the following:
> 
>  ssh -l username host 'ls'I get a list of my files.  This tells me
> SSH is working correctly.
> 
>  My question:  Has anyone encountered anything like this before?  Is
> there a way for the Solaris admin to disallow this kind of file transefers
> from one machine to another (in other words, turn off "cvs" from external
> machines)?  Is there a way to check?
> 
>  Thank you very much in advanced,
> 
>  Steve
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: How do you start the cvs server

[James Knowles]

One does not need to start a daemon to use CVS. It operates on the file
system. If you are working on the same machine as the repository, then you
need do nothing.

If you are working a different machine, then there are generally two
different approaches: 

There is the pserver mode for CVS which may prove useful if you're on a
secured network. I have personally never done much with this. A different
approach is to set up rsh to log in automatically. 

If you're accessing the CVS repository across an insecure network, then
another option, such as using ssh, is preferred. 

-- 
Political correctness is just tyranny with manners.
- Charlton Heston
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Removing top level dir from cvs module

[Neil Tardella]

Could somebody tell me how I might remove a top level directory from a repository?
basically I have:
dir1
  dir2
 dir3.1
 dir3.2
..
and I want the repository to have
dir2
   dir3.1
   dir3.2
 .

tia
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

What does state and lines mean in the cvslog file?

[Casey T. Zednick]

My friend Google does not know therefore I ask.

In the cvslog file a line looks like this:

date: 2002/02/12 18:58:07;  author: jlynde;  state: Exp;  lines: +0 -0

What does state mean? How do you tell whether lines have been changed?

Thanks,
Casey Z.


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: Ampersand module question

[Pierre Asselin]

In  "Jay Glanville" 
<[EMAIL PROTECTED]> writes:

>Thanks Martin.  It's a good start, but not all that I was looking for.  By
>using the "-d" option, what I'm doing is "front-loading" the naming
>architecture.  In other words, anytime I use module amp1, it will be under a
>directory tools

I create dummy modules for that purpose.  For example,

amp1path/to/amp1
amp2path/to/amp2
_amp1   -d tools/amp1   path/to/amp1
mod path/to/mod &_amp1 &2

The convention is that a module beginning with an underscore is not
meant to be checked out by itself --although nothing prevents you to.

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: Automagic CVS :-)

[Richard Sobota]

> 2. Is there a freeware tool that will help me automate builds?
> 
Maybe you would use ant (especially when you work in Java).
Ant is available at http://jakarta.apache.org

Richard

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

CVS question

[Nicolas PEZRON]

Hello,

I am a french student and I have to work on CVS during
my internship
I have a question : 
I thought that to you use CVS, you had to copy the
source of your first version of your program and
after, you will be able to retrieve all the versions
of your program
but, if you want to add a new file to your CVS tree,
do you have to copy first the source of this file in
order to be able to retrieve its versions after ? or
is it not necessary ?
thanks a lot for your answer

Nicolas Pezron.

___
Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français !
Yahoo! Mail : http://fr.mail.yahoo.com

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: How do you "unupdate" a file

[Kaz Kylheku]

On Thu, 11 Apr 2002, Frederic Brehm wrote:

> >Hardly -- when you try to commit, CVS will tell you that you can't
> >because you've got a sticky tag that isn't a branch.  You should
> >immediately know what to do when that happens.
> 
> I just tried that.
>   cvs update -r 1.17 foo.h
>   cd ..
>   cvs commit
> No errors! (but, I aborted the commit)
> 
> Is that a bug in CVS? I'm using CVS client and server 1.11.1p1 on Solaris 2.6

Now try it with local modifications in foo.h.


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: How do you "unupdate" a file

[Frederic Brehm]

>Frederic Brehm writes:
>>
>>  I updated a file by mistake and I'm not ready to integrate its
>>  changes with my current sandbox. An "update -r old.rev" will fix
>>  things up, but it sets a sticky tag.
>
>That's exactly what you want.
>
>>  I'll probably forget (call it a senior moment :-) to "update -A"
>>  until I thrash around a bit and figure out what's wrong. It would be
>>  nice to avoid the time wasted while thrashing around.
>
>Hardly -- when you try to commit, CVS will tell you that you can't
>because you've got a sticky tag that isn't a branch.  You should
>immediately know what to do when that happens.

I just tried that.
cvs update -r 1.17 foo.h
cd ..
cvs commit
No errors! (but, I aborted the commit)

Is that a bug in CVS? I'm using CVS client and server 1.11.1p1 on Solaris 2.6

I'm not trying to change foo.h. I'm working on some other files that 
#include foo.h. The changes made to foo.h by the other programmer are 
good, but I'm not ready to merge all the changes that go with the new 
version of foo.h.

I guess I could create a branch and continue development on the 
branch, but at this point that would be more work than it's worth. 
(And, I'm sure to remember update -A this time!)

Thanks,
Fred
-- 
Fred Brehm, Sarnoff Corporation, [EMAIL PROTECTED]
http://www.sarnoff.com/digital_video_informatics/vision_technology/index.asp

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

RE: How do you "unupdate" a file

[Greg A. Woods]

[ On Thursday, April 11, 2002 at 13:16:44 (-0400), Frederic Brehm wrote: ]
> Subject: RE: How do you "unupdate" a file
>
> I could edit CVS/Entries by hand and replace the 1.18 with 1.17. That 
> would fix the problem, but I'm wondering if there's a cvs way to do 
> it.

No, that won't fix the problem -- it'll only make it worse.

> At 12:27 -0400 4/11/02, Rajesh Patwardhan wrote:
> >depends if you dont care for the changes at all then
> >if you want you can delete the file and then do a cvs up, old 
> >revision will be back.
> 
> No, I'll get 1.18 and I want 1.17.

I suppose you could use 'cvs diff' to get the delta you wish to remove
from your local copy of the file and then use 'patch -r' to un-apply it
from your local file.

-- 
Greg A. Woods

+1 416 218-0098;  <[EMAIL PROTECTED]>;  <[EMAIL PROTECTED]>;  <[EMAIL PROTECTED]>
Planix, Inc. <[EMAIL PROTECTED]>; VE3TCP; Secrets of the Weird <[EMAIL PROTECTED]>

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: How do you "unupdate" a file

[Larry Jones]

Frederic Brehm writes:
> 
> I updated a file by mistake and I'm not ready to integrate its 
> changes with my current sandbox. An "update -r old.rev" will fix 
> things up, but it sets a sticky tag.

That's exactly what you want.

> I'll probably forget (call it a senior moment :-) to "update -A" 
> until I thrash around a bit and figure out what's wrong. It would be 
> nice to avoid the time wasted while thrashing around.

Hardly -- when you try to commit, CVS will tell you that you can't
because you've got a sticky tag that isn't a branch.  You should
immediately know what to do when that happens.

> Is there some way to restore my sandbox to to the state before I did 
> the mistaken update? It's probably possible to do some nasty things 
> with the CVS/Entries file, but is there a cleaner way?

No.

-Larry Jones

I think grown-ups just ACT like they know what they're doing. -- Calvin

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: Committing files that were tagged (sticky tags)?

[Larry Jones]

Danial Islam writes:
> 
> When I do a  "cvs co -r Release1 myModule",
> I can't check-in any files that I modified from it, it says the sticky
> tag is not on a branch.
> 
> How would someone be able to checkin from a tagged part of the stream?
> Or would I have to create a branch from Release1 and then have them
> checkin to this branch and merge to the MAIN stream from there?

It's not clear what you want to do.  If you want to keep track of bug
fixes to Release1, then you need to create a branch to do that and merge
any fixes that need to go into the current release to the trunk.  If you
just want to fix a bug that was first found in Release1 in the current
release, you can make the change to the files that you checked out in
Release1, test it, then do "cvs update -A" to update to the current
revision (which will merge your changes) and then commit.  You should
probably read the chapter on branching and merging in the manual:



-Larry Jones

I've got PLENTY of common sense!  I just choose to ignore it. -- Calvin

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: CVS Commit Problem

[Larry Jones]

Bob Goan writes:
> 
> I'm trying to use CVS in my Sun Forte for Java environment, which is a PC
> running Windows 2000, networked to a LINUX Box, and I use SAMBA to mount the
> LINUX directories locally to my PC, including the CVSROOT directory.

Using a network file system like SAMBA to access your repository is not
recommended -- you'll likely encounter any number of strange permission
problems and may end up with a corrupted repository.  Use client/server
CVS instead.  If you insist on using SAMBA, there used to be some
instructions on the SAMBA web site for configuring it to work with CVS
-- I suggest you look for them.

-Larry Jones

I won't eat any cereal that doesn't turn the milk purple. -- Calvin

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: how to delete a subdir from CVS repository?

[Larry Jones]

son writes:
> 
> Q1: how to delete a subdir from repository?

You don't.  You delete all the files from the directory and then use the
-P option whenever you checkout or update to prune the empty
directories.  The usual suggestion is to add the -P to your ~/.cvsrc
file.

> Q2: How to import symlink into CVS?

Again, you don't.  Create them as part of your build process.

-Larry Jones

I suppose if I had two X chromosomes, I'd feel hostile too. -- Calvin

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: How do you start the cvs server

[Larry Jones]

aleksey zakharov writes:
> 
> Can any one tell how to start cvs server, where is the deamon? thanks

The cvs executable can run as a client, a server, or a stand-alone
executable.  See the manual for instructions on setting up a server:



-Larry Jones

I hate it when they look at me that way. -- Calvin

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: How do you "unupdate" a file

[Greg A. Woods]

[ On Thursday, April 11, 2002 at 12:07:35 (-0400), Frederic Brehm wrote: ]
> Subject: How do you "unupdate" a file
>
> I updated a file by mistake and I'm not ready to integrate its 
> changes with my current sandbox. An "update -r old.rev" will fix 
> things up, but it sets a sticky tag.

There's no way to safely undo an update without setting a sticky tag.

-- 
Greg A. Woods

+1 416 218-0098;  <[EMAIL PROTECTED]>;  <[EMAIL PROTECTED]>;  <[EMAIL PROTECTED]>
Planix, Inc. <[EMAIL PROTECTED]>; VE3TCP; Secrets of the Weird <[EMAIL PROTECTED]>

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: how to checkout partly tagged source?

[Eric Siegerman]

On Wed, Apr 10, 2002 at 05:45:11PM +0200, Jens Fassbender wrote:
> I added a tag only to some files of my source code, e.g. to identify
> files changed within the same development step:
>
> [there's a baseline tagged with REL_1; the tag TAG_1 was
> applied only to files changed since REL_1, not to the entire
> source base]

The way not to get into this situation in the first place is to
tag the entire source tree, NOT just the files you've changed.
In CVS, a (release) tag labels a snapshot of the source base at a
particular point in time, so that you can reconstruct it later
(i.e. exactly what you're now trying to do).  Tags are not
intended to label "what changed between time A and time B", which
is how you seem to have used them.

CVS doesn't really have a good way to do the latter; it doesn't
provide the concept of a change set.  The best you can do is to
tag the entire source tree before making a round of changes, and
then again after.  Then you can use "cvs diff" or "cvs log" to
look at the differences between the two tags.  As well, at least
one of the Web GUIs sort-of adds change sets (but only intuited
after the fact; I imagine it figures out which deltas comprise a
set by looking for ones with the same timestamp and log message).


Now, recovery from your current situation.

One possibility might be something like this.  Try it on a COPY
of the repo at first, in case it messes things up further!
cvs tag -rREL_1 TAG_1

N.B.: *WITHOUT* either -f or -F options.  The idea is to apply
TAG_1 to the revision that's already tagged with REL_1, but only
for files which don't already contain TAG_1.  Any existing
TAG_1's are to be left alone.

I can't remember whether CVS will do that, or instead abort with
an error message the first time it finds a file already
containing TAG_1.  If the latter, maybe you could hack together a
temporary version of CVS that doesn't die in this case, but
simply emits a warning and plows on.

Or, something like this might work:
cvs update -rREL_1
cvs -n update -rTAG_1 >fixes
sed -n 's/^U //p'Eric Siegerman, Toronto, Ont.[EMAIL PROTECTED]
|  |  /
"Outlook not so good."  That magic 8-ball knows everything!
I'll ask about Exchange Server next.
- Anonymous

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: Updating branch w/ file added in trunk

[Kaz Kylheku]

On 11 Apr 2002, Danial Islam wrote:

> Date: 11 Apr 2002 13:07:51 -0400
> From: Danial Islam <[EMAIL PROTECTED]>
> To: [EMAIL PROTECTED]
> Subject: [info-cvs] Updating branch w/ file added in trunk
> 
> I have a branch called 'Patch1' which was created off the main trunk's
> module called 'test',
> 
> e.g.
> 
> cvs rtag -b Patch1 test
> cvs co -d Patch1_files -r Patch1 test
> 
> So I am working on the Patch1 branch and make changes to it.  Then
> suddenly on the main trunk, a new file 'file.c' is added and thus all
> the branches need to be updated with this new file.  How will I do this?

Adding a file on a main trunk does not mean that all branches must also
get that file.  The main trunk is a separate, independent line of
development. That is why you made the branch in the first place, to
create a logical sequence of related changes which are free from
interference from the main trunk.

CVS does not support very well the idea of merging from the trunks to
branches, but it's possible. 

Simply go on the branch and do cvs update -j FOO -j BAR, where FOO and
BAR are two revisions on the main trunk: symbolic revisions, or date
specifications.  If revision FOO does not exist in a file, but BAR
does, then CVS will do the merge by locally adding the file, so that
file adds are handled.  Ideally, FOO and BAR are special tags that you
maintain yourself which keep track of what has been merged and to what
branch. There are various conventions for doing this. Tags based on
dates, a ``last merge'' tag that is pushed forward, etc.

In CVS, the intended model is that branches are temporary diversions which
are used to stabilize a release, or to develop an experimental feature.
Some version control systems support a model in which branches are
permanently diverged, equally important ``product lines'' that can be
kept in sync while maintaining their differences---differences that are
not intended to be integrated into one line. Under this second model,
you can merge from any branch to any branch.

This is possible in CVS, but since CVS doesn't track what has been
merged where, it's difficult and error prone. It basically requires
some intelligent scripting that gets it right.  Also, the revision data
structures (RCS files) used by CVS are optimized toward the main trunk.
Checking out branches requires the computation of zero or more deltas
rooted at the head revision of the main trunk. Branches that grow
longer and longer require more and more computation to check out.

The simpler ``fork and join'' branching model still requires manual
merge tracking, but it's easier to handle because each branch has one
logical place that it merges to.  So for a given branch, it's not
necessary to keep track of what has been merged to N other places.


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

RE: How do you "unupdate" a file

[Frederic Brehm]

At 11:30 -0500 4/11/02, [EMAIL PROTECTED] wrote:
>"an unmodified copy of your file is also in your working directory, with the
>name `.#file.revision' where revision is the revision that your modified
>file started from.  (Note that some systems automatically purge files that
>begin with `.#' if they have not been accessed for a few days. If you intend
>to keep a copy of your original file, it is a very good idea to rename it.)"

So, here I have an unmodified foo.h version 1.17 and I update it 
accidently and get version 1.18. There doesn't seem to be a .#foo.h 
in this case (at least, it isn't in my sandbox anymore). No problem! 
I can make one with

cvs update -p -r 1.17 foo.h > '.#foo.h.1.17'

>cd to your work area
>ls -la(and you should see the .#file.revision file)
>mv ".#file.revision" file  (to overlay your modified file prior to the
>update)

Now, what happens if I forget that I did this and commit the file? I 
wipe out the changes between 1.17 and 1.18 made by the other 
programmer. Not good. This is worse than forgetting to update -A 
after a update -r 1.17 because I've made problems for everyone, not 
just for myself.

I could edit CVS/Entries by hand and replace the 1.18 with 1.17. That 
would fix the problem, but I'm wondering if there's a cvs way to do 
it.


At 12:27 -0400 4/11/02, Rajesh Patwardhan wrote:
>depends if you dont care for the changes at all then
>if you want you can delete the file and then do a cvs up, old 
>revision will be back.

No, I'll get 1.18 and I want 1.17.

Fred
-- 
Fred Brehm, Sarnoff Corporation, [EMAIL PROTECTED]
http://www.sarnoff.com/digital_video_informatics/vision_technology/index.asp

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: Automagic CVS :-)

[Gianni Mariani]

Witchman wrote:

>
> 
>2. Is there a freeware tool that will help me automate builds?
>
What specifically do you want here ?

somthing like gnu make ?



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: PROPOSAL: Addressing the list's spam issue: was: [GB2312] ±ÜÃâåeÎóµÄÍâÙQÐÐäN·½Ê

[Todd Denniston]

"Robert J. Clark" wrote:
> 
> On Mon, 8 Apr 2002 18:00:47 -0400 (EDT)
> R P Herrold <[EMAIL PROTECTED]> wrote:
> 
> > I have copied RMS (who seems able to get attention ) on
> > poll results:  6 in favor, 0 opposed, 5 new pieces of spam at
> > the moment.
> 
> Definitely +1
> 
> - Rob
> 
+1

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: How do you "unupdate" a file

[Kaz Kylheku]

On Thu, 11 Apr 2002, Frederic Brehm wrote:

> Date: Thu, 11 Apr 2002 12:07:35 -0400
> From: Frederic Brehm <[EMAIL PROTECTED]>
> To: [EMAIL PROTECTED]
> Subject: [info-cvs] How do you "unupdate" a file
> 
> I updated a file by mistake and I'm not ready to integrate its 

You mean you *changed* a file by mistake?

> changes with my current sandbox. An "update -r old.rev" will fix 
> things up, but it sets a sticky tag.

This doesn't fix anything; it only retrieves an old version. Moreover,
it will merge any local changes you have made to that old version,
possibly causing conflicts.

If you need to restore to a repository version, there are two cases.

If it's the newest version on whatever branch you are on, then this
is just a case of discarding local changes. Simply remove the local
file and do a cvs update. Alternately, newer CVS versions have an
update option for getting a pristine copy: update -C. Your file is now
up to date with no local modifications.

If the version you want to restore to is not the latest one, then
there are two ways to do it. One is to patch backwards to the
older version using an update with two -j options. Another is
to use cvs update -r old-rev -p to pipe the update to standard output,
which sets no sticky tag. Redirect the output to the file you want to
restore. Either way, you need to commit.

-- 
Meta-CVS: solid version control tool with directory structure versioning. 
http://users.footprints.net/~kaz/mcvs.html  http://freshmeat.net/projects/mcvs


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Updating branch w/ file added in trunk

[Danial Islam]

I have a branch called 'Patch1' which was created off the main trunk's
module called 'test',

e.g.

cvs rtag -b Patch1 test
cvs co -d Patch1_files -r Patch1 test

So I am working on the Patch1 branch and make changes to it.  Then
suddenly on the main trunk, a new file 'file.c' is added and thus all
the branches need to be updated with this new file.  How will I do this?

Would I have to use the brute force method, i.e. manually copy 'file.c'
from the trunk's directory to all the branches and do a 'cvs add file.c'
on them all?


Danial.


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Automagic CVS :-)

[Witchman]

Automagic CVS:

1. Is there a freeware tool that will help me do a cross-module query on
tags?
 
2. Is there a freeware tool that will help me automate builds?


Thanks!

Michael Lawrie
Member, Technical Staff
Northrop Grumman - TASC
www.tasc.com

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

RE: How do you "unupdate" a file

[Dale . Miller]

Fred,

Look at the "C" update output code details in the manual at

http://www.cvshome.org/docs/manual/cvs_16.html#SEC152

which states

"an unmodified copy of your file is also in your working directory, with the
name `.#file.revision' where revision is the revision that your modified
file started from.  (Note that some systems automatically purge files that
begin with `.#' if they have not been accessed for a few days. If you intend
to keep a copy of your original file, it is a very good idea to rename it.)"


cd to your work area
ls -la(and you should see the .#file.revision file)
mv ".#file.revision" file  (to overlay your modified file prior to the
update)

Note that the double quotes are needed because of the ".#" name prefix.

Dale Miller
Northrop Grumman IT

> -Original Message-
> From: Frederic Brehm [mailto:[EMAIL PROTECTED]]
> Sent: Thursday, April 11, 2002 11:08 AM
> To: [EMAIL PROTECTED]
> Subject: How do you "unupdate" a file
> 
> 
> I updated a file by mistake and I'm not ready to integrate its 
> changes with my current sandbox. An "update -r old.rev" will fix 
> things up, but it sets a sticky tag.
> 
> I'll probably forget (call it a senior moment :-) to "update -A" 
> until I thrash around a bit and figure out what's wrong. It would be 
> nice to avoid the time wasted while thrashing around.
> 
> Is there some way to restore my sandbox to to the state before I did 
> the mistaken update? It's probably possible to do some nasty things 
> with the CVS/Entries file, but is there a cleaner way?
> 
> Thanks,
> Fred
> -- 
> Fred Brehm, Sarnoff Corporation, [EMAIL PROTECTED]
> http://www.sarnoff.com/digital_video_informatics/vision_techno
logy/index.asp

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: Binary File Storage on CVS - Space Questions (fwd)

[Kaz Kylheku]

On Wed, 10 Apr 2002, Witchman wrote:

> Date: Wed, 10 Apr 2002 21:42:04 -0400
> From: Witchman <[EMAIL PROTECTED]>
> To: 'Kaz Kylheku' <[EMAIL PROTECTED]>
> Subject: [SPAM] RE: Binary File Storage on CVS - Space Questions
> 
> Kaz,
> 
> Thanks for the response.   What kind of behavior will I see over time
> with additional additions and deletions?  I will see the same kind of
> space usage that I would normally expect from a text file?  That seems
> to be the what your reply suggests.

No; I hope my reply suggests that you were only lucky. It depends
entirely on the properties of what you are storing. In general, it's
quite bad. For example, I have seen files with two megabyte checkout
sizes take up 90 megabytes in the repository.

Really, people should try to avoid putting binary files into CVS.
There are other problems, such as binary files not being susceptible
to merging, which interferes with parallel development.

-- 
Meta-CVS: solid version control tool with directory structure versioning. 
http://users.footprints.net/~kaz/mcvs.html  http://freshmeat.net/projects/mcvs


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

How do you "unupdate" a file

[Frederic Brehm]

I updated a file by mistake and I'm not ready to integrate its 
changes with my current sandbox. An "update -r old.rev" will fix 
things up, but it sets a sticky tag.

I'll probably forget (call it a senior moment :-) to "update -A" 
until I thrash around a bit and figure out what's wrong. It would be 
nice to avoid the time wasted while thrashing around.

Is there some way to restore my sandbox to to the state before I did 
the mistaken update? It's probably possible to do some nasty things 
with the CVS/Entries file, but is there a cleaner way?

Thanks,
Fred
-- 
Fred Brehm, Sarnoff Corporation, [EMAIL PROTECTED]
http://www.sarnoff.com/digital_video_informatics/vision_technology/index.asp

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: Committing files that were tagged (sticky tags)?

[Gianni Mariani]

I think you can simply create a branch tag over the top of Release1

e.g.

cvs co -r Release1 srctree
cd srctree
cvs tag -b Release1_Branch
cvs update -r Release1_Branch

 give it a try on a test repository

Danial Islam wrote:

>I have this example where I tag my stream at different point, but not as
>branches:
>
>
>
>MAIN Stream
>Release1---Release2--Release3->
>
>
>
>The tags are Release1, Release2, and Release3.
>
>When I do a  "cvs co -r Release1 myModule",
>I can't check-in any files that I modified from it, it says the sticky
>tag is not on a branch.
>
>How would someone be able to checkin from a tagged part of the stream?
>Or would I have to create a branch from Release1 and then have them
>checkin to this branch and merge to the MAIN stream from there?
>
>Danial.
>
>
>
>___
>Info-cvs mailing list
>[EMAIL PROTECTED]
>http://mail.gnu.org/mailman/listinfo/info-cvs
>




___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Committing files that were tagged (sticky tags)?

[Danial Islam]

I have this example where I tag my stream at different point, but not as
branches:



MAIN Stream
Release1---Release2--Release3->



The tags are Release1, Release2, and Release3.

When I do a  "cvs co -r Release1 myModule",
I can't check-in any files that I modified from it, it says the sticky
tag is not on a branch.

How would someone be able to checkin from a tagged part of the stream?
Or would I have to create a branch from Release1 and then have them
checkin to this branch and merge to the MAIN stream from there?

Danial.



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: why does wincvs show all files as modified

[Anjali Madhekar]

Just fyi...we came across the exact problem that all files appeared  "locally
modified" after the daylight savings time switch. And yes, 'status' is the best
way to work around this problem.

Thanks for the detailed information on this WinCVS bug/problem.

Anjali

[EMAIL PROTECTED] wrote:

> Hi,
>
> This is a follow-up to an old thread about WinCVS showing files as "locally
> modified" when they haven't been changed in the working copy.
>
> We're using WinCVS 1.2 on Windows NT, solely using the CVS client bundled
> with WinCVS.  Our working copies are only managed through the GUI.  No
> command-line checkouts or anything.
>
> Shortly after the Daylight Savings Time switch (I'm in the U.S.), I got the
> all-locally-modified problem that others have described.  I checked the
> timestamps in the CVS/Entries file, and they seemed somewhat strange.  Most
> of them had the correct UTC time, but some seemed to be off by an hour.
> After doing a "status" on the directory, these incorrect timestamps all
> changed by an hour, to the correct UTC time.  So I'm experiencing the same
> daylight-savings timestamp bug already described in this thread.  The
> problem is clearly not the timestamp of the file on disk, nor how WinCVS
> interprets the timestamps, but the checkout or update that initially sets
> the CVS/Entries timestamps.
>
> The main thing I wanted to point out to the newsgroup is that taking the
> "status" of the directory is a very simple workaround, and it's what I've
> recommended to our developers.  You don't have to change the WinCVS
> installation or blow away your working copy.  Whenever I have suspicious
> "locally modified" files in WinCVS, the first thing I do is "status" the
> directory.
>
> Jim Doyle
>
> ___
> Info-cvs mailing list
> [EMAIL PROTECTED]
> http://mail.gnu.org/mailman/listinfo/info-cvs


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: inetd.conf problem

[Joi Ellis]

On Thu, 11 Apr 2002, Iqbal Shaikh wrote:

> 
> Hi All,
> 
> We  had  implemented a cvs  server on linux  6.2.
> We then faced the problem of  cvs repository  entries  limitation
> in the  inetd.conf file.
> 
> We have intentions of  having our cvs server installed on the Sun
> Solaris Machine.
> We have got  solaris 2.7 running on this machine.
> 
> Just  want to know , if there will be similar limitations on inetd.conf
> file
> on solaris2.7
> If there is then what could be the solution.

Write a shell script to launch your cvs pserver command with all of  your
repositories, then call that shell script from inetd.conf instead of 
cvs pserver directly.

That's how I did it on one of my RH 6.2 boxes.
-- 
Joi EllisSoftware Engineer
Aravox Technologies  [EMAIL PROTECTED], [EMAIL PROTECTED]

No matter what we think of Linux versus FreeBSD, etc., the one thing I
really like about Linux is that it has Microsoft worried.  Anything
that kicks a monopoly in the pants has got to be good for something.
   - Chris Johnson


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

inetd.conf problem

[Iqbal Shaikh]

 
Hi All,
We  had  implemented a cvs  server on linux  6.2.
We then faced the problem of  cvs repository  entries 
limitation
in the  inetd.conf file.
We have intentions of  having our cvs server installed on the Sun
Solaris Machine.
We have got  solaris 2.7 running on this machine.
Just  want to know , if there will be similar limitations on inetd.conf 
file
on solaris2.7
If there is then what could be the solution.
Please do reply.
Thanks and Regards
iqbal