On Nov 8, 2010, at 09:44 , Peter Soetens wrote:

> On Monday 08 November 2010 14:50:03 Peter Soetens wrote:
>> On Sunday 17 October 2010 23:57:52 S Roderick wrote:
>>> Built and tested on macosx.
>>> Built on gnulinux.
>>>
>>> The following changes since commit
>>>
>>> 4f75d50ab09d83bace3e22e5d97c26f3de6068e0: Peter Soetens (1):
>>> Bump trunk version to 1.12.99
>>>
>>> are available in the git repository at:
>>> git://gitorious.org/~snrkiwi/orocos-toolchain/snrkiwi-rtt.git v1-next
>>>
>>> Stephen Roderick (4):
>>> cmake: Prevent duplicate library warning on macosx
>>> corba: Erase partially built ControlTaskServer if required naming
>>>
>>> service missing tlsf: Add statistic debug functions for default memory
>>> pool
>>>
>>> macosx: Port rtos_mutex to support TLSF
>>>
>>> src/corba/ControlTaskServer.cpp | 1 +
>>> src/os/macosx/fosi.h | 10 +++++++++
>>> src/os/macosx/fosi_internal.cpp | 41
>>>
>>> +++++++++++++++++++++++++++++++++++++++ src/os/tlsf/tlsf.c |
>>>
>>> 29 ++++++++++++++++++++++---- src/os/tlsf/tlsf.h | 2 +
>>> tests/CMakeLists.txt | 5 +++-
>>> 6 files changed, 82 insertions(+), 6 deletions(-)
>>
>> I can't merge branches to v1, since merge commits confuse git-svn. I can
>> only git format-patch these and then apply them (similar to a manual
>> rebase).
>>
>> I'll see how it works out.
>
> They applied fine on master from the format-patch output. The revision on which
> you based your work (Bump trunk version to 1.12.99) will be forced-updated
> because it doesn't have an svn-commit-id. If you notice that the HEAD of a git
> branch for 1.x does not have a svn-commit-id, don't base your work on it since
> history will be rewritten.

Ok, sorry, I didn't realise. Thanks for taking care of this, I'll send patches for anything v1-related in the future
S