Re: Update versions

[Giovanni Giazzon]

Yes, I'm a little confused about branches.
Let me put this way: I have a branch named MOPdev, which is the current
project MOP development branch. All demands are concluded and I have to
create a new version for the new deploy. So I create a version named MOPver5
from the MOPdev branch. After the deploy a bug shows up and we need to fix
it. Here comes my doubt... What should I do? Create a new branch, make the
changes and merge with the version? It is possible to merge? If so, is there
a problem to remove this new branch after the merge? You said "The branch
then contains your bug fixes, not garbage, so you wouldn't want to delete
it." Yes, but then I'll have two branches for the same version.

Sorry about the misunderstanding. I'm coming from SourceSafe...

Regards,
Giovanni Giazzon



----- Original Message -----
From: "Larry Jones" <address@hidden>
To: "Giovanni Giazzon" <address@hidden>
Cc: <address@hidden>
Sent: Wednesday, July 09, 2003 2:51 PM
Subject: Re: Update versions


> Giovanni Giazzon writes:
> >
> > I agree with you, but we're facing some problems regarding
administrative
> > access. We can't remove branches and versions. Each one we create
remains in
> > the repository as garbage. But I guess someone in the list told that if
you
> > remove a branch, the version created from it will also be removed. Is
this
> > true?
>
> I still don't understand the problem -- if you need to fix a bug in a
> released version of your code, you need to create a bug fixes branch off
> of that release.  The branch then contains your bug fixes, not garbage,
> so you wouldn't want to delete it.
>
> You seem to have some fundamental misunderstandings about branches in
> CVS.  When you "create a branch", you're not really creating a branch,
> you're just creating a branch tag in each of the files, which takes up a
> miniscule amount of space in the RCS file and may add an even more
> miniscule amount to the time needed to process that RCS file.  The
> branch isn't really created until you check in a change.  There really
> isn't any convenient way in CVS to delete a branch.  You can delete the
> branch tag; if there were never any revisions checked in to the branch,
> then deleting the branch tag removes all traces of the branch.  If there
> were revisions checked in on the branch, removing the branch tag has no
> effect on them, other than making them difficult to access since there's
> no longer any branch tag pointing to them.
>
> -Larry Jones
>
> I don't like these stories with morals. -- Calvin