Re: Merging from yourself fails

On Wed, Jun 11, 2008 at 12:54 PM, Blair Zajac <blair_at_orcaware.com> wrote:
>>>> It sounds like the same bug. It is possible the merge of the
>>>> issue-3000 branch to trunk has created an additional scenario where we
>>>> are running into it. We have had this in our 1.5.x branch for a long
>>>> time, but not trunk.
>>>>
>>>> I believe we can stop having the problem by removing some of our
>>>> subtree mergeinfo, but to date we have chosen not to do any manual
>>>> fixes. If you are using a trunk client, you can apply and review Paul
>>>> Burba's patch.
>>>
>>> Thanks. I'm going to try his patch. Reviewing the patch is going to
>>> take
>>> more cycles then I have though :)
>>
>>
>> Well, using it is a form of review too :) Let us know how it goes.
>
> Are we considering the fixes of these issues suitable for inclusion into a
> 1.5.x release?

Yes, if it is at all possible. I imagine we need to see what the
fixes wind up being though.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org