Rob Brandt wrote:
> The idea is for them to do
> their work locally, commit changes to the dev server where it's tested
> (simple
> with Tortoise), and then the live server updated from trunk once it's
> approved.
I would recommend an extra step in there where a tag is created once the
code is ready for approval. If you're updating the live website from the
same trunk where development is done, it's very difficult to be sure
that no additional changes are made between when you approve the code
and when you update the live site. You must either halt all dev work
during the review process, or you introduce a race condition when you
perform the update, neither of which is desirable.
Of course creating a new tag prior to each update might be overkill in
your case, because you'd have to "switch" the live site's working copy
to the new tag before updating it. In this case you may want to consider
the notion of a "floating" tag, where the previous tag is deleted and a
new one with the same name is created. This is a little different from
convention but that's a great thing about Subversion is that conventions
are *just* conventions and how you use it is up to you.
Either way, whoever is reviewing the code checks it out (or browses it
or diffs it or whatever) *from the tag*, and the update to the live site
is made *from the tag*, and you don't have to worry about locking down
trunk or dealing with the possibility of unreviewed code making it to
your live site.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Nov 29 06:40:01 2005