Re: [PATCH] URL copied via "Copy URL to clipboard" results in error when pasted into Merge dialog

>
>
> Just one more thing <tm>.  In MergeWizardTree.cpp, you first check the URL 
> using GetWindowText but when setting the m_urlFrom and m_urlTo you still 
> get the URL using GetString(). So I would re-order things as in patch [1]. 
>

nice catch!
You can commit the patch now yourself.
 

> I will have a second look at TortoiseProc (as mentioned in the previous 
> message) to see if I can make it emit a path base in to WC root instead of 
> just the file name. I guess it might be difficult to do with TortoiseMerge 
> since it basically compares two different files on the computer. It could, 
> possibly, emit a path based in the WC root if either file is in a WC (in 
> the patches in the first message, C:/Devel/tortoisesvn is a WC), but it 
> will be impossible to do with the file from %TEMP%.
>

That would be good, yes.
However, it is usually enough to emit the filename: when applying a patch, 
TMerge automatically searches for a path that matches the paths/names in 
the patchfile.
 

>  
>
>> If you would register at osdn.net I can give you commit access so you 
>> can commit your fixes yourself :)
>>
>
> Login: danielsahlberg
>
> Appreciate your confidence :-)
>

You now have full access.

Stefan

-- 
You received this message because you are subscribed to the Google Groups "TortoiseSVN-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn-dev/b10a9096-6c63-45e5-89c3-1057bb99351dn%40googlegroups.com.