Michael van der Westhuizen wrote:
Hi Martin,
On 9/29/07, Martin Sebor <[EMAIL PROTECTED]> wrote:
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!
Have you considered using svnmerge? It will let you cherry-pick
cha
Hi Martin,
On 9/29/07, Martin Sebor <[EMAIL PROTECTED]> wrote:
> 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!
Have you considered using svnmerge? It will let you cherry-pick
changes and fixes from trunk into the
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
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.
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
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 croa
rent compilers please hold off on checking
> your changes in until after the merge.
>
> Thanks
> Martin
>
>
--
View this message in context:
http://www.nabble.com/merging-trunk-to-4.2.0-tf4489171.html#a12891733
Sent from the stdcxx-dev mailing list archive at Nabble.com.
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 che
