Re: Why is --reintegrate neccessary?
From: Les Mikesell <lesmikesell_at_gmail.com>
Date: Thu, 23 Sep 2010 17:13:37 -0500
On 9/23/2010 4:53 PM, Piers Haken wrote:
Yes, but a lot of work can be done by implementing the change on the
> For example, when a bug is fixed in the release branch, we need the change to be propagated back to the various QA and dev branches. The only way to do this is to cherry-pick those changes, otherwise SVN will attempt to merge the previous forward-merges back into those branches. Heaven forbid you have some renames in there! It gets more complicated when you have changes going in two directions sometimes it seems like SVN wants to apply the same change twice to the same tree. As far as I can tell this is all expected behavior.
Fixing something in release, then propagating to qa seems like the wrong
Why not just cut new qa branches from the trunk with all the current
> I'd like to use a free, centralized vcs that can handle merge tracking well, but I guess I'll have to wait...
It's a lot simpler if you can just drive things one direction (trunk
-- Les Mikesell lesmikesell_at_gmail.comReceived on 2010-09-24 00:14:23 CEST
This is an archived mail posted to the Subversion Users mailing list.