Re: branches and merging

[Mark D. Baushke]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Venkatesh, Vijay <address@hidden> writes:

> I guess this is a fairly often asked question
> but just wanted to run this by everyone to get
> some feedback first. (am referring to the
> essential cvs guidebook)
> 
> Have two branches app4 and app4_test, which I
> need to merge (and have done so already into the
> app4 branch, so merged from app4_test into app4)

> question1 :

> should i now tag app4 to signify the point at
> which the merge was made?

It would be prudent to do this if you ever wish to
do subsequent merges of the app4_test into the app4
branch in the future. However, if app4_test is to be
left dorment, then the tag is not really useful.

> question2:
> if i do tag app4 at this point, should other users checkout another version
> of the branch(at the tag point)
> or just up -r to that tag?

In most cases, users are only interested in the
branch, not in a snapshot of it at a partciular
time.

Users should therefore ignore that the nwe merge
point tag exists and continue to use the branch.

> question3:

> if i do tag and users to get to that tag
> version, how do they make subsequent changes

Users do not use the tag, they continue to use the
branch.

> i.e. continue work on the app4 branch beyond
> that tag? Do i need to make another branch at
> this point, or ?

Not applicable.

> This is where I got really confused in the
> documentation.
> 
> Pls help.,
> Thanks
> V
> 
> 
> 
> 
> ****************************************************************************
> This email may contain confidential material.
> If you were not an intended recipient, 
> please notify the sender and delete all copies.
> We may monitor email to and from our network.
> 
> ****************************************************************************

This is a silly disclaimer. Consider lobbying with
the appropriate authorities to have it removed as e-mail
sent to a public mailing list is often archived in multiple
locations and you have no chance at all of getting it deleted.

We do not care if your employer does not trust
you. All e-mail on this list may be monitored by
anyone. Maybe they will learn something.

        Good luck,
        -- Mark
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (FreeBSD)

iD8DBQFCgEvd3x41pRYZE/gRAowSAJ9TUzwwn72yDamUyivjn3t04MNAhgCgy1ps
/5a/xVDtRPac0L1C9oGD9Y8=
=Z/a1
-----END PGP SIGNATURE-----