Boost logo

Boost :

From: David Abrahams (dave_at_[hidden])
Date: 2007-11-01 22:56:52

on Thu Nov 01 2007, Beman Dawes <> wrote:

> David Abrahams wrote:
>> I hope everyone is using
>> when merging changes between branches and trunk. That's very
>> important if we're going to avoid merge hell.
> The plan isn't to do what the TortoiseSVN docs call a "Range of
> Revisions" merge, but rather what those docs call "Merging Two Different
> Trees".

Do I have to learn about TortoiseSVN in order to understand what
you're saying? I don't really use Windows for development anymore.

> Since in effect that just copies the file from the trunk to the
> release branch, there isn't any chance of merge hell, if I understand
> what you mean. This approach also minimizes the chance that the code
> will break, since the code is unchanged from the code being tested on
> the trunk.
> Is there any reason to use for a tree/tree merge?

Probably, especially if you're ever merging back and forth between two

> --Beman
> PS: Subversion 1.5 will fold in the merge tracking
> functionality.

Yes I know.

> It should ship fairly soon. TortoiseSVN will release a
> new version at the same time that also supports merge tracking. See
> for more information.
> _______________________________________________
> Unsubscribe & other changes:

Dave Abrahams
Boost Consulting

Boost list run by bdawes at, gregod at, cpdaniel at, john at