Boost logo

Boost :

Subject: [boost] Merge tracking (Was: trunk vs release (svn:externals))
From: Vladimir Prus (vladimir_at_[hidden])
Date: 2009-05-27 03:07:00

Sebastian Redl wrote:

> Vladimir Prus wrote:
>> Beman Dawes wrote:
>>>>> Boost developers and release managers, OTOH, don't ever do project wide
>>>>> merges. Instead, everything happens on a library by library basis. I would
>>>>> expect merging a single library would be easier if its header files lived
>>>>> entirely within the library's boost-root/libs/libname tree.
>>>> Having libraries organized with nearby headers may be a better organization
>>>> scheme and make some operations easier: agreed, we'll try it out. I'll
>>>> maintain that whether or not to put these perhaps-better-organized
>>>> directories on the ends of svn:externals is a different issue with long term
>>>> consequences.
>>>> Right now boost developers and release managers do single project switches;
>>>> (modulo those who go to the trouble of using svnmerge.)
>>> Didn't svnmerge become obsolete when Subversion added merge tracking?
>> I don't think the server was upgraded.
> It was. I'm using merge tracking in my own branch.

It is not unlikely I'm doing something wrong, but:

$ svn mergeinfo
svn: Retrieval of mergeinfo unsupported by ''

This message suggests that repository itself was not upgraded (if the server
is 1.5 indeed).

Are you using a different command?

- Volodya

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