You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@cxf.apache.org by Sergey Beryozkin <sb...@gmail.com> on 2010/12/20 16:40:31 UTC

Problems merging into 2.3.x

Hi

I'm facing a strange issue,  I can not merge the r1051115

http://svn.apache.org/viewvc?rev=1051115&view=rev

into 2.3.x.

Not sure what might've changed recently.
If someone give me a favor and try to do

svnmerge.py merge -r1051115

into the local 2.3.x SNAPSHOT and if it works then merge it (without
building) then it would be appreciated ?
I'll take the responsibility for the associated failures if any ?

Or perhaps I've got confused and am missing something obvious ?

thanks, Sergey

Re: Problems merging into 2.3.x

Posted by Sergey Beryozkin <sb...@gmail.com>.

I managed to back-merge it but only after removing the local snapshot and
checking out the 2.3.x branch again,

sorry for a noise anyway
Sergey

On Mon, Dec 20, 2010 at 3:40 PM, Sergey Beryozkin <sb...@gmail.com>wrote:

> Hi
>
> I'm facing a strange issue,  I can not merge the r1051115
>
> http://svn.apache.org/viewvc?rev=1051115&view=rev
>
> into 2.3.x.
>
> Not sure what might've changed recently.
> If someone give me a favor and try to do
>
> svnmerge.py merge -r1051115
>
> into the local 2.3.x SNAPSHOT and if it works then merge it (without
> building) then it would be appreciated ?
> I'll take the responsibility for the associated failures if any ?
>
> Or perhaps I've got confused and am missing something obvious ?
>
> thanks, Sergey
>
>
>
>