Re: FromURL parameter not working if not using URL of working copy as default

Brent Warner wrote:
> The fromurl parameter to the merge command of TortoiseProc does not
> appear to work unless the user has enabled the setting to use the URL of
> the working copy as the default from URL. In OnInitDialog of
> CMergeWizardRevRange
>
>
>
> if (!(DWORD)CRegDWORD(_T("Software\\TortoiseSVN\\MergeWCURL"),
> FALSE))
>
> m_URLCombo.SetCurSel(0);
>
> else if (!pWizard->url.IsEmpty())
>
>
> m_URLCombo.SetWindowText(CPathUtils::PathUnescape(pWizard->url));
>
>
>
> So if the setting is false or doesn’t exist, we never look to the wizard
> for the URL that was passed in.
>

You're right - the /fromurl param is never used (the pWizard->url points
to the wc url).

Fixed in r16649.

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=2366287
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].