[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: assertion during merge in 1.6.1

From: Paul Burba <ptburba_at_gmail.com>
Date: Fri, 1 May 2009 17:55:43 -0400

On Mon, Apr 20, 2009 at 12:08 PM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> Paul Burba wrote:
>> On Mon, Apr 20, 2009 at 11:46 AM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
>>
>> r37385 makes it an error to attempt a reintegrate merge from and/or to
>> the root of the repository.  None of these make any sense for
>> reintegrate agreed?
>
> Agreed. And thanks for your fix to now throw a proper error instead of
> hitting the assertion.
>
> Stefan

Hi Stefan,

BTW, that fix I made in r37385 is nominated for backport to 1.6.x. and
1.5.x. It's got two votes in 1.6.x/STATUS and 1.6.2 is coming very
soon, be a shame if it didn't get in...hint, hint ;-)

Paul

P.S. Senthil, I see you voted for r37385 in 1.6.x, any objections to
backporting it to 1.5.x too?

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2020404
Received on 2009-05-01 23:55:57 CEST

This is an archived mail posted to the Subversion Dev mailing list.