Re: Merging / reintegration procedure

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?

tyler

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2394764

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