> -----Original Message-----
> From: Stefan Sperling [mailto:stsp_at_elego.de]
> Sent: Monday, February 14, 2011 11:27 AM
> To: Varnau, Steve (Neoview)
> Cc: Daniel Becroft; users_at_subversion.apache.org
> Subject: Re: Dangerous to keep re-integrated branches alive?
>
> On Mon, Feb 14, 2011 at 06:05:26PM +0000, Varnau, Steve (Neoview)
> wrote:
> > > -----Original Message-----
> > > From: Stefan Sperling
> > > No, the files can differ. E.g. consider what happens if the branch
> modifies
> > > the very last line of a file. Now the branch is synced to trunk to
> prepare
> > > it for reintegration. The file receives no changes. Next, someone
> commits
> > > a change to trunk changing the very first line of the file. Then
> you
> > > perform the reintegrate merge, and it's likely that this merge is
> > > conflict-free (unless the file is very short). Now you commit the
> result
> > > of the reintegration merge, and the files on the branch and the
> trunk are
> > > not the same -- they differ in the first line.
> >
> > Okay, but then I would not want to block that revision with a record-
> only merge, right? I would want to pick up that merge resolution the
> next time I sync-up the branch.
> >
>
> Which revision do you intend to block, precisely?
>
> I think you eventually want to merge into the branch the revision that
> added the first line to the file on trunk.
> But that is not the same revision as the one that committed the result
> of the reintegrate merge. So in this example it's perfectly fine to
> block
> the reintegration revision from being merged into the branch, isn't it?
Ah, quite right. Then the harder case is if the intervening change to trunk also changed the last line. Then my reintegration merge has to do conflict resolution. Perhaps some combination of the changes on that last line. I commit that to trunk, and block my latest trunk revision from being merged back to my branch. So, the next time I do synch up the branch, I get to resolve that same conflict again on the branch, hopefully the same or better resolution as on trunk.
That seems fine. As long as I did not get fancy and make other gratuitous changes that were not strictly conflict resolution in the reintegration merge, it should be okay to keep the branch alive.
Thanks for helping me think that through.
-Steve
Received on 2011-02-14 22:51:53 CET