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

Re: Merging / reintegration procedure

From: Tyler Roscoe <tyler_at_cryptio.net>
Date: Mon, 14 Sep 2009 13:03:37 -0700

On Mon, Sep 14, 2009 at 12:51:11PM -0700, Alex wrote:
> Since major refactoring is going on in the trunk, changes are
> backported by hand, not using svn merge. My understanding of

This sounds like a bad idea.

> The reason for accepting all changes from trunk is that all changes
> have been backported and the trunk is considered stable. We do not
> want any changes from the old staging branch sticking around. Simply
> going to staging and doing an svn merge will leave me dealing with
> conflicts and potentially diffs since the backport is not always the
> same as the original change.

So why not just delete the branch and create it anew from trunk once you
are confident that all the changes you want are in the codeline where
they're supposed to be?



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-14 22:04:16 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.