stdcxx-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Martin Sebor <>
Subject Re: merging trunk to 4.2.0
Date Sat, 29 Sep 2007 03:29:40 GMT
Andrew Black wrote:
> Greetings Martin
> I suspect the cause of the subversion messages was because you were
> using a protocol of http, rather than https in the source tree.

Hmm. I suppose it's possible, although I'm not sure why most files
merged successfully and only the new ones failed. Maybe it works
for changes to existing files and not for new ones. I know it would
complain in some cases and I tried to be consistent but I could
have easily missed it. If that was it, I kick myself in the head
because the whole dang merge took me almost two days to finish!


> Rel branch testing should begin when the archives are rebuilt tonight,
> unless you'd like me to get the ball rolling sooner.
> --Andrew Black
> Martin Sebor wrote:
>> The merge to branches/4.2.0 is complete now. Assuming our testing
>> confirms that the merge was successful we'll tag it (4.2.0-rc-5)
>> sometime next week. The merge was very difficult because of the
>> large number of changes and because of what seems to be an svn
>> limitation: the command line client croaks on merges containing
>> added files with the following error:
>>     svn: Access scheme mixtures not yet supported
>> I worked around it by copying the files from trunk over to the
>> branch via svn cp. Before checking everything in I did a diff
>> of all files to make sure they matched. Since some of them
>> weren't merged correctly for some odd reason I copied those as
>> well and repeated the process until there were no diffs (except
>> for $Id: keywords). I also verified the branch by building the
>> library, examples, tests, and utilities, with gcc 4.1 on Solaris.
>> So even though I'm pretty confident that merge went okay the
>> branch probably shouldn't be used for any serious work until
>> we've put it through a round of testing on a number of
>> platforms.
>> Andrew, could you please you set up the head of the 4.2.0 branch
>> for nightly testing?
>> Thanks
>> Martin
>> Martin Sebor wrote:
>>> A typo introduced last night into one of the Rogue Wave build
>>> scripts has caused all last night's builds to fail. We've corrected
>>> the typo this morning and scheduled a new set of builds to take
>>> place ASAP. The planned merge will take place once we've
>>> seen at least a representative sample of the build results.
>>> Martin
>>> Martin Sebor wrote:
>>>> I'm planning to merge all of the trunk to branches/4.2.0 as soon
>>>> as the recently introduced build failures have cleared up in the
>>>> build results. This could be as early as tomorrow and hopefully
>>>> no later than early next week. Until then, I'd like to ask all
>>>> committers to be extra careful before checking in any library or
>>>> build and test infrastructure changes (including the test driver)
>>>> that might adversely impact multiple platforms. If you can't test
>>>> with *at least* two different compilers please hold off on checking
>>>> your changes in until after the merge.
>>>> Thanks
>>>> Martin

View raw message