On Tue, Nov 18, 2008 at 4:09 PM, Purple Streak
<mrpurplestreak_at_googlemail.com> wrote:
> 2008/11/18 David Glasser <glasser_at_davidglasser.net>:
>> We used to not have reintegrate. This is because we all forgot that,
>> in the Subversion model, the operation of merging to your development
>> branch and the operation of merging back from it are actually
>> incredibly different (the former is a 1-URL rev-range diff, and the
>> latter is a 2-URL diff). Now we have reintegrate. Perhaps this is
>> lame, but that's how Subversion branching works.
>
> Is this true from the SVN book...
>
> "In Subversion 1.5, once a --reintegrate merge is done from branch to
> trunk, the branch is no longer usable for further work. It's not able
> to correctly absorb new trunk changes, nor can it be properly
> reintegrated to trunk again. For this reason, if you want to keep
> working on your feature branch, we recommend destroying it and then
> re-creating it from the trunk"
>
> So once you reintegrate that means the branch is dead (which means you
> must merge everything back in one go and start a new branch)?
Yes and no.
The idea is that branches are cheap and it makes sense to "re-branch".
If you do not re-branch the point is that you cannot simply do
another synch up merge with trunk as you had been doing before. If
you do, then it will attempt to merge back the merge you did from the
branch. So you either need to do a 2-URL merge to synch trunk back to
the branch or perhaps a --record-only merge in the branch so that it
does not try to merge it back.
From a documentation point of view, I think it makes sense to
recommend that users re-branch.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-18 22:26:57 CET