Re: Question about how to handle long running branch that needs trunk updates

I wonder about this. Will it really do what the documentation says so long as
issue 2897 is unresolved
(http://subversion.tigris.org/issues/show_bug.cgi?id=2897).

My understanding of that issue was that so long as it was
unresolved, things like --reintegrate would not work for our use case.

Am I wrong on this? Because the documentation makes it sound like it does
exactly what we were looking for.

Thanks,
Allen

eg <egoots_at_gmail.com> wrote: Allen Servedio wrote:

> How do people handle conditions like this?
>
> If reflective merging was supported, here is how we would have done this:
>
> 1) Branch from trunk to create project branch proj1
> 2) Commit some changes in trunk and merge them to proj1
> 3) Commit some work to proj1
> 4) Repeat steps 2 and 3 a couple of times (in any order and number of times)
> 5) (THIS IS THE BIT NOT CURRENTLY SUPPORTED) The project is complete, so
> merge proj1 back to trunk
>

I think this last step can be done with the -reintegrate merge option.

Read the section in the subversion book nightly build (for 1.5) that is
in the "Common Branching Patterns" in a subsection titled "Feature
Branches"... I think it describes your workflow.

The url is:
http://svnbook.red-bean.com/

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org

       
---------------------------------
Be a better friend, newshound, and know-it-all with Yahoo! Mobile. Try it now.
Received on 2008-02-20 15:04:08 CET