Re: N00b branch question -- links point to trunk now, or then?

[Jim Hyslop]

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

address@hidden wrote:
> Hi All,
> 
> Trying to figure out what to use for source control.

CVS, of course ;-)

> I have a respository containing file1 and file2.  I make a branch of
> this repository to work in.  I change only file2.  Meanwhile, some
> other developer has made changes to file1 in the trunk.
> 
> I "get latest" (not sure what the correct term is, sorry) on my branch.

"Get latest" works for me.

>  Do I see that developer's changes to file1, or do I see file1 as it
> was when the branch was created?  Can cvs be configured to give me the
> changes to file1, or configured to prevent me from getting those
> changes, or does it just have one behavior?

You will not get any of the other developer's changes. file1 will remain
as it was, until you (or someone else working on the branch) make a
change and check it in.

If you _want_ the changes, you can do that by merging the file. Merging
is covered in the manual, but feel free to post any questions you may have.

> I've been reading cvs docs all day, and I haven't found this explicitly
> stated.  Something called "ampersand modules" looks interesting, so I'm
> going to try and figure that out, but at this point, that's a bit
> advanced for me (although any dumbed-down explanations welcome).

Ampersand modules are a different beast entirely. Basically, it's a way
to package two or more modules (directories) into a single module.
Modules are independent of branches.

- --
Jim Hyslop
Dreampossible: Better software. Simply.     http://www.dreampossible.ca
                 Consulting * Mentoring * Training in
    C/C++ * OOD * SW Development & Practices * Version Management
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (MingW32)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFERWvXLdDyDwyJw+MRAr06AJ9IYib87UdT1iXhJ+XiO492FNvIigCgqCd5
P/0wR2IZg/eJCxZR468AIBg=
=RyIm
-----END PGP SIGNATURE-----