Nice!
Stefan, if you're the one who added it, you might also want to link to it in the section I mentioned, where it says "once a --reintegrate merge is done from branch to trunk, the branch is no longer usable for further work".
Jacob
On Feb 18, 2010, at 8:51 AM, Stefan Sperling wrote:
> On Thu, Feb 18, 2010 at 11:22:36AM -0500, Rob van Oostrum wrote:
>> On Thu, Feb 18, 2010 at 11:19 AM, Jacob Weber <jacob_at_jacobweber.com> wrote:
>>> Do you mean that I don't need to delete my branch after a reintegrate, as
>>> suggested here:
>>>
>>>
>>> http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html#svn.branchemerge.basicmerging.reintegrate
>>>
>>> and that instead, I can just record the revision of the merge as having
>>> being merged into my branch?
>>>
>>> You may have just changed my life, sir. :)
>>>
>> You don't need to. The suggestion on that page is just that if you no longer
>> need the branch, it's perfectly safe to remove it (since you can always
>> resurrect it if need be).
>
> See this section of the book for a more thorough explanation:
> http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.reintegratetwice
>
> It was added to the book just yesterday, so it's understandable
> that you missed it :)
>
> Stefan
Received on 2010-02-18 18:37:45 CET