Re: best practices to keep a local branch up2date

Dieter Oberkofler wrote:
> I've been using SVN in a production environment for almost a year now and
> just love it.
> Up until now I have been mostly using a local trunk but I'm now starting to
> more and more use local branches when making some more complex changes on
> our project and was wondering what the most appropriate way would be to keep
> my branch up2date with the changes in the trunk.
> I've read the documentation and am aware that this can be done by "merging"
> the changes in the trunk into my branch but was wondering:
> 1) I feel that being as close as possible to the trunk (or more generally
> the source of my branch) is generally a good idea. Is this reasonable?

Yes. Merge often.

> 2) Should the merging best done in the branch on the server and then update
> the local one or immediately on the local one and then commit the changes?

Always do merges into a clean working copy. It doesn't matter where you do the
merge.

> 3) It is a little complicated to keep track of what has been already merged
> or what needs to be merged. What is the best technique to proceed here and
> what happens if I merge twice the same changes?
> Thank you for your help,

Until svn 1.5 comes out, use svnmerge.py to manage merges of changes from trunk
to the branch.

It handles keeping track of what's already merged.

http://www.orcaware.com/svn/wiki/Svnmerge.py

Regards,
Blair

-- 
Blair Zajac, Ph.D.
http://www.orcaware.com/svn/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org