[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: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 30 Aug 2013 20:45:53 +0200

On 30.08.2013 20:22, Alexander Haley wrote:
> 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;
>
>
> ?

I've created issue #547 for this:
http://code.google.com/p/tortoisesvn/issues/detail?id=547

I think the fix is much easier. If you look at the changes in r24686 you
can easily see my mistake: before HEAD was passed as the revision
unconditionally. But now it passes the @rev (if the url has one). But if
the url does not have one, the 'rev' variable is initialized to
svn_opt_revision_unspecified instead of HEAD.
The fix is easy: initialize the rev to HEAD.

I'll commit the fix soon, needs some more testing first.

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

That's the correct list, yes.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest interface to (Sub)version control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3063646
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-08-30 20:46:06 CEST

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