On Wed, May 13, 2009 at 2:04 PM, Bob Archer <Bob.Archer_at_amsi.com> wrote:
> > now, i understand the need to svn rm B, and recreate it. however, here
> is my question.
>
>
>
> You can also record a merge from trunk back to B so you can continue using
> the branch.
>
>
>
> >that there will be no more downstream merges from A -> B. is that
> reasonable, or is there some danger i should know about?
>
> If you do a re-integrate and you haven’t merged from A -> B then when you
> merge back to A you (if I understand correctly) could loose stuff that you
> have added to A. Because the merge will not see those changes in the branch
> and assume the need to be removed from A. If that makes sense?
>
another detail i didnt provide earlier..
once the first reintegration merge is run, no more work on A, except for
potentially more reintegration merges.
> Hmm.. I tried to create a sample for this and was getting tree conflicts.
> Strange. I’m gonna post about that.
>
we've been using this flow in old subversion w/o issue. only now we're
getting to the point in our lifecycle where ill be running reintegration
merges (on 1.5+). im also a bit nervous about the need to supply
--reintegration when running what i would call 'upstream' merges. what if
the flag is not supplied, is the merge history not recorded on the upstream
branch?
-nathan
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2242774
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-05-13 22:34:21 CEST