Subversion vs. CVS - Sticky Tags

Hi all,

We are thinking of switching from CVS to Subversion, but there is one
thing I
am not quite sure how to do in Subversion.

Consider a workspace with three files; "common1", "common2" and
"special".
We have different customer-versions (not revisions, rather versions in
the meaning
of flavours) of the SW, and we have organized the code so that "common1"
and "common2"
contain code that is independent of the customer. All code that is
customer
specific goes into the file "special".

With CVS I commit "common1" and "common2" on the main branch.
I will commit "special" on a separate branch for each customer.

Now say that I have 2 customers and the branches "cust1" and "cust2". To
set up a
working view for customer 1, in CVS I would do
    cvs checkout .
    update -r cust1 special

Whenever I want to update my view with the latest changes on "common1"
and
"common2" I make a
    cvs update
This updates my workspace with all the committed changes on "common1"
and "common2"
on the main branch.

I do not see how I can do this in Subversion. It seems to me that I am
forced to branch
all files, and do a merge in order to get the newer versions of
"common1" and "common2".
The drawback with this is that I need to keep in mind that "special" is
the only file
I do not want to perform a merge upon. In CVS the tool remembers this
automatically for
me, by having a sticky tag set on it.

Am I missing something?

Thanx in advantage for any help!

----------

Thomas Aho

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jul 5 20:05:48 2006