[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r27964

From: John Peacock <john.peacock_at_havurah-software.org>
Date: 2007-11-21 19:43:34 CET

Stefan Sperling wrote:
> given that I will have to do the same thing soon while maintaining
> the tree conflicts branch, how do you keep your branches in the svn
> repository in sync with trunk?

FWIW, I use svk for all of my merging needs, but lots of other people
are using svnmerge.py for this purpose. Both of these tools use private
properties to mark merge points. I have no experience with svnmerge.py,
but I find that SVK almost always does the right thing without any
interaction by me.

The only thing that freaks out SVK [when using a mirror of a remote
repo] is when a file is both renamed to a new path and edited in the
same rev. However, fixing that is a relatively simple matter of
replicating the move in my local branch and then redoing the smerge from
the mirror. Pushing local changes back up to the source mirror should
be done with '--verbose' (and possibly '--lump'), so that the main repo
doesn't have nested log messages.

> Also, how frequently do you tend to sync with trunk?
> Whenever you feel like it?
> Once a week?
> Whenever big changes happened on trunk?

<vorlon>beep...warble...swoosh...Yes...</vorlon> ;-)

YMMV

John

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Nov 21 19:43:50 2007

This is an archived mail posted to the Subversion Dev mailing list.