subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Rob van Oostrum <rva...@gmail.com>
Subject Re: Branch from a branch -- will merges still work?
Date Thu, 18 Feb 2010 16:00:46 GMT
On Thu, Feb 18, 2010 at 10:17 AM, Jacob Weber <jacob@jacobweber.com> wrote:

> I'm wondering if the following pattern will work:
>
> - a branch A from trunk, where features are developed, before they're
> released into trunk
> - a branch AA from A, where more experimental features are developed,
> before they're released into A, and then eventually into trunk. This way,
> while A's features are still being tested, new features based on them can be
> developed.
>
> My concern is this:
> After we reintegrate from A into trunk, we'll need to revert A to trunk
> (according to my understanding of reintegrate merges.) So once we do that,
> will we still be able to reintegrate from AA into A, or will their
> connection be broken?
>
> Is there a better way to achieve the same result (being able to do new
> development based on still-unreleased changes)?
>
> Thanks,
> Jacob


If you need to keep A around after reintegration to trunk, all you need to
do is do a --record-only merge back to your branch to avoid merge conflicts
(caused by the reintegration merge) when bringing in additional trunk
changes.

No reason your proposed solution couldn't work.

R.

Mime
View raw message