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

Re: TortoiseSVN 1.8.2 , Merge dialog Show Log bug?

From: Alexander Haley <ahaley_at_meditech.com>
Date: Fri, 30 Aug 2013 14:22:58 -0400

Another guess:

In void CMergeWizardRevRange::OnBnClickedShowlog() , the new code to tackle
the @ revision:

    SVNRev rev;

    // check if the url has a revision appended to it
    auto atposurl = sUrl.ReverseFind('@');
* if (atposurl >= 0)*
    {
        CString sRev = sUrl.Mid(atposurl+1);
* rev = SVNRev(sRev);*
         if (rev.IsValid())
        {
            sUrl = sUrl.Left(atposurl);
        }
    }

It handles defining rev *IF* an @ sign was found ... however, nothing sets
rev when no @ sign was found... perhaps it is passing garbage in the
subsequent

        m_pLogDlg->SetParams(url, rev, rev, 1, TRUE, FALSE);

setup?

So - perhaps the code change is:

    if (atposurl >= 0)
    {
        CString sRev = sUrl.Mid(atposurl+1);
        rev = SVNRev(sRev);
        if (rev.IsValid())
        {
            sUrl = sUrl.Left(atposurl);
        }
    }
    else rev = SVNRev::REV_HEAD;

?

p.s. question - am I supposed to be sending this kind of info to this list
... ? I'm unsure who wants to know this.

On Fri, Aug 30, 2013 at 2:05 PM, Alexander Haley <ahaley_at_meditech.com>wrote:

> Digging deeper - I see Revision 24686
> changed /trunk/src/TortoiseProc/MergeWizardRevRange.cpp so that the
> "merge-ee url" would have an @rev portion automatically handled....
>
> IF I repeat my example steps, AND provide a @#### at the end of the
> svn/trunk URL , viola, the 'show log' button works properly. Perhaps that
> is a good place to start digging more?
>
>
> On Fri, Aug 30, 2013 at 1:56 PM, Alexander Haley <ahaley_at_meditech.com>wrote:
>
>> Hello, I am encountering a snag with the "Show Log" button found on the
>> Merge dialog. This is the button associated with the "specific range"
>> field. Basically, I click show log and the log appears but throws an
>> "Invalid revision passed to Log()." error. Here are some screen shots
>> reproducing this based on a checkout from the TortoiseSVN's own repository.
>>
>> 1) checking out only the root of the tortoisesvn trunk:
>>
>> [image: Inline image 1]
>>
>> 2) Now I initiate a Merge into the checked out working copy
>>
>> [image: Inline image 2]
>>
>> 3) The merge dialog lets me click 'show log' for specific range(s) of
>> revisions:
>>
>> [image: Inline image 3]
>>
>> 4) Clicking this yields the log window with the log error:
>>
>> [image: Inline image 4]
>>
>> Now , I have zero need to merge into the TortoiseSVN trunk - this was
>> just a demonstration. The code which produces this message is in:
>>
>> src\LogCache\CacheLogQuery.cpp , void CCacheLogQuery::ThrowBadRevision()
>>
>>
>> Has anyone else the same error?
>>
>> --
>> Alexander Haley, Computer Scientist, 781-774-5156
>> Medical Information Technology, Inc.
>> Mailstop: F4E16W, MEDITECH Circle, Westwood, MA 02090
>>
>
>
>
> --
> Alexander Haley, Computer Scientist, 781-774-5156
> Medical Information Technology, Inc.
> Mailstop: F4E16W, MEDITECH Circle, Westwood, MA 02090
>

-- 
Alexander Haley, Computer Scientist, 781-774-5156
Medical Information Technology, Inc.
Mailstop: F4E16W, MEDITECH Circle, Westwood, MA 02090
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3063639
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].




image.png image.png image.png image.png
Received on 2013-08-30 20:23:22 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.