Re: Question about how to handle long running branch that needs trunk updates

[John Peacock <jo...@havurah-software.org>]

Allen Servedio wrote:
> How do people handle conditions like this?

Use SVK?  I've used this extensively to manage private branches of 
public projects (like Subversion).

Or you could use svn-merge.py?  This will notate the merge history and 
produce the minimal changeset required to merge the branch back into 
trunk without duplicate merges (AIUI).

HTH

John

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Question about how to handle long running branch that needs trunk updates

[Allen Servedio <al...@yahoo.com>]

I don't think we had looked at SVK, but we had originally looked at svnmerge.py. I
think that we had not used it originally simply because we were just starting to
use Subversion and did not understand that we would need svnmerge.py to try to
do what we were doing (just naive newbie users).

I see that there is a conversion script when 1.5 comes out for svnmerge.py, so
that makes it appealing to try to start using now
(http://svn.collab.net/repos/svn/trunk/contrib/client-side/svnmerge/svnmerge-migrate-history.py).

Thanks for the feedback!
Allen

John Peacock <jo...@havurah-software.org> wrote: Allen Servedio wrote:
> How do people handle conditions like this?

Use SVK?  I've used this extensively to manage private branches of 
public projects (like Subversion).

Or you could use svn-merge.py?  This will notate the merge history and 
produce the minimal changeset required to merge the branch back into 
trunk without duplicate merges (AIUI).

HTH

John

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org



       
---------------------------------
Looking for last minute shopping deals?  Find them fast with Yahoo! Search.