lördag 28 maj 2022 kl. 20:45:42 UTC+2 skrev Stefan: > >> 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. >
r29402 > 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. > That's clever. The command line 'svn diff' is basing the file names on the current working directory and not the WC root. After some basic checks, it seems TortoiseProc is being fed a list of full paths without a notion for "working directory" and it bases the patch in the lowest common denominator of these paths. Since there are already some differences and TMerge is clever enough to work them out I will probably ignore it (I've got other itches to scratch, more in a new thread). 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. > Thanks! /Daniel -- 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 tortoisesvn-dev+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn-dev/50320682-9647-4c91-8d4d-4def12175432n%40googlegroups.com.
