building a release: branching or tagging

[Edward Dunkle]

please excuse if this is a double post.  It seems earlier posts have failed.

What is the recommneded practise for building an incremental release without
pulling  in incomplete code changes in the main trunk?

Some have suggested that we never branch and merge but simply tag individual
files associated with each implemented change to be included in the next
release so that each of these may be pulled specifically.  Do you see any
issues with this approach?

The docs seem to describe branching and merging as an approach to use.  Are
people successful with this?  

DO you make releases off a branch and then merge it into the trunk and then
make another branch for the next release?  

Do you make one branch for each release or branch and merge for each change
request that is to be included in the next release?

Thanks,
Ed

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

Patent Issues

[Petric Frank]

Hello,

recently i had a view on Rational (former Atria) ClearCase Patents.
Especially the one from US Patent Office granted on with number
5,649,200 seems to conflict with cvs.

Due to the fact that english is not my mother tongue and i am also not a
lawyer - what is your expression on this patent.
In my read there might be a problem.

I wrote a mail 3 weeks ago to cyclic.com, but up to now there was no
response.

regards
  Petric

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

rtag with revision tags

[David Koski]

I am attempting to:

cvs rtag -r INITIAL_REVISION_1_0 -b NEW_BRANCH mymodule

..but I get the error:

cvs [rtag aborted]: no such tag INITIAL_REVISION_1_0

INITIAL_REVISION_1_0 is the release tag supplied to "cvs import" and can be seen with 
the "cvs status -v" command on the checked out copy of mymodule.  Executing "cvs rtag" 
without the -r parameter succeeds as does supplying a branch tag "-r EXISTING_BRANCH" 
to "cvs rtag".  Do revision tags not work for rtag -r arguments?  If not, do I need to 
apply a "cvs tag" first?  If so, will the tag apply to the repository or just to the 
sandbox.

Regards,
David Koski
[EMAIL PROTECTED]

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

Re: Help with understanding tagging

[Larry Jones]

Miller Sally S NPRI writes:
> 
> It looks like I'm seeing a problem with rtag.
> cvs history -T 
> T 06/06 18:00 + smith   modulename [June2002:A]
> T 06/07 21:13 + jones   modulename [June2002:A]
> 
> Seeing the same name tag on the same module made me concerned.

Why?  It could have been a redundat tag operation that didn't actually
do anything (other than get recorded in the history file), or someone
could have been moving the tag -- that's a perfectly normal thing to do.

> out of curiosity I did 
> cvs rdiff -s -r June2002 -r HEAD modulename
> and again there were 20 files that had changes. 
> I started looking at the files and they were modified *BEFORE* the rtag was done.
> 
> Shouldn't the rtag have picked up the new changes?

It's impossible to say based on just the history log -- you need to know
the exact command the user used.  I always recommend against using rtag
without specifying a specific revision to tag since you have no way of
knowing exactly what you're tagging otherwise.  If the user *did*
specify a specific revision to tag (either by sepcifying an existing tag
or a date), then the changes shouldn't be picked up.

-Larry Jones

OK, there IS a middle ground, but it's for sissy weasels. -- Calvin

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

Help with understanding tagging

[Miller Sally S NPRI]

We are running CVS 1.10 on Solaris 

It looks like I'm seeing a problem with rtag.
cvs history -T 
T 06/06 18:00 + smith   modulename [June2002:A]
T 06/07 21:13 + jones   modulename [June2002:A]


Seeing the same name tag on the same module made me concerned.
so I did 
cvs rdiff -s -D 2002-06-06 -D 2002-06-07 modulename
sure enough there was about 10 new file changes.

out of curiosity I did 
cvs rdiff -s -r June2002 -r HEAD modulename
and again there were 20 files that had changes. 
I started looking at the files and they were modified *BEFORE* the rtag was done.

Shouldn't the rtag have picked up the new changes?

Sally

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

RE: multiple developers sharing one working directory

[Judy Pearson]

Noel -

Just wanted to clarify: we do have a Unix sys admin; the person we lost was a person 
who operated, among other things, as a source
control admin. So I am getting plunked into that space.

Thanks so much for all the info and input. I'll look into the advisory lock patch.

I don't consider your questions for the pro-locking crowd inflammatory at all, maybe 
because they sound a lot like the noise I make
and I know I'm always so reasonable :=) . You brought up some very good points. For 
now I'm focusing on making things work using
locking, but I'll incorporate your questions into any discussions I have with people 
and will certainly let you know how it goes.

- Judy

> -Original Message-
> From: Noel Yap [mailto:[EMAIL PROTECTED]]
> Sent: Friday, June 07, 2002 5:19 PM
> To: Judy Pearson; [EMAIL PROTECTED]
> Subject: RE: multiple developers sharing one working directory
>
>
> --- Judy Pearson <[EMAIL PROTECTED]>
> wrote:
> > > 1. Why did the group move from VSS to CVS?
> >
> > The group has been wanting to move from VSS for
> > quite awhile. I can think of:
> >
> > - We're a Unix shop and want reliable,
> > smoothly-automated regular (nightly or more often)
> > and easily configurable builds on our Unix
> > boxes. Couldn't see a nice way of arriving there
> > using Windows VSS. We looked into Unix VSS for a
> > short time (bad idea: buggy and
> > unsupported).
>
> It's not a good sign if your company is a Unix shop
> and they don't have a proper sysadmin.
>
> > - Doggy off-site access (I don't have the details -
> > I only know it was to slow).
>
> I can imagine since Windows is so GUI-centric.
>
> > - There were various other complaints about VSS
> > behavior. It was a pain to override working folders
> > set below the current project
> > level. There were timing problems with transferring
> > files from the Windows side to Unix via Samba
> > resulting in end sections of files
> > getting dumped. People wanted Unix command-line
> > access to the repository. I don't remember the rest.
> >
> > We're moving to CVS primarily because we want
> > something mainstream and Unix-based that is not very
> > expensive.
>
> Which rules ClearCase out :-)
>
> > > 2. Why does the group not like CVS?
> > >
> > The group as a whole is quite mixed in their
> > attitudes about CVS. A number of people are quite
> > relieved to be moving to a standard,
> > Unix-based repository system. For most, switching
> > from the repository-based VSS to the workspace-based
> > CVS is a mind-bender.
>
> This is understandable.
>
> > Some of
> > the developers have only used VSS and they've used
> > it for over 3 years. While they were annoyed with
> > VSS, they expect standard
> > Windows apps behavior and don't think they're
> > getting it from WinCVS. Two of the people in the
> > small group that is doing this jsp
> > work are very Windows-centric and, I think, don't
> > like anything that smells of Unix. Unfortunately,
> > these are the first people to be
> > jumping in with both feet.
>
> I've never used WinCVS so I can't comment much about
> this.  Have you tried using any of the other GUI front
> ends (none of which I've myself tried) out there?
> Maybe one of them'll make these two a little happier.
>
> In the end, they'll either have to bite the bullet or
> find a shop that'll make them happier.
>
> > Another thing that muddies it all: After a lot of
> > wrangling, our boss decided we would use CVS with
> > locking (I offered to wrestle
> > him over it, but he just pulled rank on me). We're
> > using our own tcl macros in WinCVS to do locking and
> > editing - and the reverse -
> > in one-step processes. I am sure some of the
> > confusion people are having stems from the square
> > peg, round hole problems associated
> > with using locking in cvs. In addition, there were
> > other GUIs that I think would have been better
> > accepted than WinCVS, but got
> > ruled out a priori because they didn't support
> > locking and didn't have decent macro tie-ins to
> > compensate.
>
> You might want to look at the advisory lock patch
> available at SourceForge under project RCVS (I really
> need to write a FAQ about this).  This patch adds the
> "-c" option to "cvs edit" and "cvs ci" such that "cvs
> edit -c" will abort if another edit exists and "cvs ci
> -c" will abort if no valid edit exists (you might also
> want to take a look at the other patches for "cvs
> edit" like the multiple edits patch).
>
> Advisory locks aren't exactly reserved locks since:
> 1. Users don't have to use the options (although
> putting them in their ~/.cvsrc files will help.
> 2. Users can override the options with "-f".
>
> OTOH, they'll provide more protection than anything a
> front end will give:
> 1. You won't have to answer the following:
>a. If someone uses the command line or another
> front end to subvert the reserved lock, what'll
> happen?
>b. How will the system recover?
>c. Will the system give meaningful errors?
>  

RE: WinCVS options

[Vijay Narayanan]

Hi,

This piece i from rcslock.pl tells me about how to setup Reserved Locking in
cvs by default. I hope!

++
Setup:
# Add the following line to the commitinfo file:

# ALL /local/location/for/script/lockcheck [options]

# Where ALL is replaced by any suitable regular expression.
# Options are -v for verbose info, or -d for debugging info.
# The %s will provide the repository directory name and the names of
# all changed files.
++

I am not sure as to what to give in place of ALL. what regular expression
could this be! Also, is there something wrong with the script. I am not
seeing the %s part in the above lines.

Thanks in advance!
Vijay

-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
Sent: Monday, June 10, 2002 6:47 PM
To: [EMAIL PROTECTED]
Cc: [EMAIL PROTECTED]
Subject: Re: WinCVS options


> Hi,
>
> Im not sure if this list will cater to WinCVS problems.
>
> I have a WinCVS client talking to a CVS Server on Linux.
>
> I need to be able to configure CVS to tell other developers whenever a
> module is checked out in CVS.
> All my developers are using WinCVS to interact with CVS.
>
That doesn't really make sense in CVS, since checking out a module
is a trivial act.  Is it really necessary to notify all the developers
whenever anybody gets another copy of the source, or are you looking
for notification when anybody plans to change a file?

David H. Thornley| If you want my opinion, ask.
[EMAIL PROTECTED]   | If you don't, flee.
http://www.thornley.net/~thornley/david/ | O-


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

RE: WinCVS options

[Vijay Narayanan]

How do I make cvs use the reserved checkout by default. In other words,
where do I specify the cvs admin -l/L option.
Can I do this from within win-cvs?

Thanks
Vijay

-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]On Behalf Of
Vijay Narayanan
Sent: Monday, June 10, 2002 6:20 PM
To: [EMAIL PROTECTED]
Subject: WinCVS options


Hi,

Im not sure if this list will cater to WinCVS problems.

I have a WinCVS client talking to a CVS Server on Linux.

I need to be able to configure CVS to tell other developers whenever a
module is checked out in CVS.
All my developers are using WinCVS to interact with CVS.

The WinCVS guide talks about Read-Only checkouts. I did this but the
option(Monitor Selection -> Edit Selection) as documented after setting the
read-only checkout flag does not appear. Is this a  version issue or am I
doing something wrong here?

Thanks in advance,
Vijay


___
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: need help please.. new to cvs and having trouble with permissions

[Larry Jones]

fredes writes:
> 
> Can anyone enlighten me on cvs permissions?

Have you read the relevant section of the manual?



-Larry Jones

I sure wish I could get my hands on some REAL dynamite. -- Calvin

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

Re: CVS Update from 1.10.7 -> 1.11.1p1 or later

[Noel Yap]

--- Nikolaus Schusser <[EMAIL PROTECTED]> wrote:
> I think, we will have to upgrade our
> CVS-server-binary (UNIX)
> in the nearest future, because we will need enhanced
> commands
> like 'rdiff', 'rlog', and so on ...
> 
> What happens, if I upgrade my CVS-server from 1.10.7
> to
> 1.11.1p1, what should I take care of, especially
> with
> locally checked out copies and history files ?
> 
> Is it just as easy like copying the new version over
> the
> old one, or will I have to run conversion-utilities,
> to
> make my files compatible with the new CVS ?

Typically, I try never to install over anything. 
Instead, I'll install a clean copy and provide a
symlink to it.  This way, in the off chance that
something is broken, it's extremely easy to roll back
-- just symlink back to the old version.

Noel

__
Do You Yahoo!?
Yahoo! - Official partner of 2002 FIFA World Cup
http://fifaworldcup.yahoo.com

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

Re: need help please.. new to cvs and having trouble with permissions

[Noel Yap]

--- fredes <[EMAIL PROTECTED]> wrote:
> Everything is working except for the fact that users
> and groups aren't
> working properly. For some reason if I check in a
> module using wincvs client
> the files become read-only and owned by that user
> and another user cant do
> anything. I'm afraid that I don't quite understand
> what's going on and
> really would love a helping hand! Im sure Ive setup
> the groups and users
> properly!
> 
> Can anyone enlighten me on cvs permissions?

It sounds like you're talking about the repo files
(rather than the sandbox files).

If you're using Unix as your repository, the users'll
need to set CVS_UMASK (or is it CVSUMASK?) to
something more friendly like 002.

Also, ensure that the repo directory permissions are
group writable.

Noel


__
Do You Yahoo!?
Yahoo! - Official partner of 2002 FIFA World Cup
http://fifaworldcup.yahoo.com

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

RE: WinCVS options

[Vijay Narayanan]

Thats ok. The notification on Checkout really is not required. What I am
looking for is a way to use reserved checkouts using WinCVS wherein a
folder/module can be checked out by only one person. If somebody else tries
to checkout the same, he should be getting an error/warning stating the
same. Is that possible in WinCVS?

Thanks
Vijay

-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
Sent: Monday, June 10, 2002 6:47 PM
To: [EMAIL PROTECTED]
Cc: [EMAIL PROTECTED]
Subject: Re: WinCVS options


> Hi,
>
> Im not sure if this list will cater to WinCVS problems.
>
> I have a WinCVS client talking to a CVS Server on Linux.
>
> I need to be able to configure CVS to tell other developers whenever a
> module is checked out in CVS.
> All my developers are using WinCVS to interact with CVS.
>
That doesn't really make sense in CVS, since checking out a module
is a trivial act.  Is it really necessary to notify all the developers
whenever anybody gets another copy of the source, or are you looking
for notification when anybody plans to change a file?

David H. Thornley| If you want my opinion, ask.
[EMAIL PROTECTED]   | If you don't, flee.
http://www.thornley.net/~thornley/david/ | O-


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

Re: CVS Update from 1.10.7 -> 1.11.1p1 or later

[david]

> Hello !
> 
> I think, we will have to upgrade our CVS-server-binary (UNIX)
> in the nearest future, because we will need enhanced commands
> like 'rdiff', 'rlog', and so on ...
> 
> What happens, if I upgrade my CVS-server from 1.10.7 to
> 1.11.1p1, what should I take care of, especially with
> locally checked out copies and history files ?
> 
> Is it just as easy like copying the new version over the
> old one, or will I have to run conversion-utilities, to
> make my files compatible with the new CVS ?
> 
Once you've copied it over, do a "cvs init".  I don't think it will
do anything in this case, but it's a good habit to develop when
upgrading CVS.  Other than that, yes, it is just that easy.

David H. Thornley| If you want my opinion, ask.
[EMAIL PROTECTED]   | If you don't, flee.
http://www.thornley.net/~thornley/david/ | O-

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

Re: WinCVS options

[david]

> Hi,
> 
> Im not sure if this list will cater to WinCVS problems.
> 
> I have a WinCVS client talking to a CVS Server on Linux.
> 
> I need to be able to configure CVS to tell other developers whenever a
> module is checked out in CVS.
> All my developers are using WinCVS to interact with CVS.
>
That doesn't really make sense in CVS, since checking out a module
is a trivial act.  Is it really necessary to notify all the developers
whenever anybody gets another copy of the source, or are you looking
for notification when anybody plans to change a file?

David H. Thornley| If you want my opinion, ask.
[EMAIL PROTECTED]   | If you don't, flee.
http://www.thornley.net/~thornley/david/ | O-

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

WinCVS options

[Vijay Narayanan]

Hi,

Im not sure if this list will cater to WinCVS problems.

I have a WinCVS client talking to a CVS Server on Linux.

I need to be able to configure CVS to tell other developers whenever a
module is checked out in CVS.
All my developers are using WinCVS to interact with CVS.

The WinCVS guide talks about Read-Only checkouts. I did this but the
option(Monitor Selection -> Edit Selection) as documented after setting the
read-only checkout flag does not appear. Is this a  version issue or am I
doing something wrong here?

Thanks in advance,
Vijay


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

cvs log checking per branch ?

[Heikki Doeleman]

Hi 
there
 
I am wondering 
whether there is a way to require a certain cvs log format --per branch--, not 
per module. 
 
For example, I want 
to require a format like "bugnr: " in my release branch, but not 
in the main branch.
 
The documentation 
about the "verifymsg" trigger seems to only allow this kind of restriction per 
module. I suppose that if I had the branch name available in the verifymsg 
trigger it would be easy to do. Is there a way to get at this info ? Like in the 
commitinfo trigger, where you have a list of the files to be committed, and so 
can ask of each file (with "cvs status") which branch it is 
in?
 
Thanks in advance 
!
Heikki
 Heikki DoelemanInfo.nl - Sint Antoniesbreestraat 16 - 1011 HB  Amsterdam 
Tel. +31 (0)20 530 9100 - Fax. 
+31 (0)20 530 9101 [EMAIL PROTECTED] - http://info.nl 
 

CVS Update from 1.10.7 -> 1.11.1p1 or later

[Nikolaus Schusser]

Hello !

I think, we will have to upgrade our CVS-server-binary (UNIX)
in the nearest future, because we will need enhanced commands
like 'rdiff', 'rlog', and so on ...

What happens, if I upgrade my CVS-server from 1.10.7 to
1.11.1p1, what should I take care of, especially with
locally checked out copies and history files ?

Is it just as easy like copying the new version over the
old one, or will I have to run conversion-utilities, to
make my files compatible with the new CVS ?

Thanx a lot

__
Nikolaus Schusser, Internal IT Administration

Hyperwave Research & Development
Albrechtgasse 9/2.St.
A-8010 Graz

Tel. +43 316 82 09 18 - 640, Fax +43 316 82 09 18 - 99

mailto: [EMAIL PROTECTED]
homepage: http://www.hyperwave.com
__

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

need help please.. new to cvs and having trouble with permissions

[fredes]

Hi all,

I'm new to this list as well as to cvs I'm afraid.. I have learnt a lot but
still have problems with permissions. I recently installed cvs on my local
network on redhat 7.2.

Here are some details...

Everything is working except for the fact that users and groups aren't
working properly. For some reason if I check in a module using wincvs client
the files become read-only and owned by that user and another user cant do
anything. I'm afraid that I don't quite understand what's going on and
really would love a helping hand! Im sure Ive setup the groups and users
properly!

Can anyone enlighten me on cvs permissions?

regards

Fred






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