Stefan schrieb am Mittwoch, 9. Dezember 2020 um 19:02:52 UTC+1:
> On Wednesday, December 9, 2020 at 12:32:39 PM UTC+1 Tobias Knauss wrote: > >> ok, so here are a couple of bugs. >> >> I am currently checking the result of a merge by checking the >> modifications. There are hundrets of modified files, dozens of added and >> deleted, and most are still "normal". >> >> 1) (critical!) I found that some files, that have been moved AND >> modified, are shown as "normal (+)". This is wrong, they must be shown as >> "modified (+)". I am checking all modified files, but if files are falsely >> shown as normal, then I don't check them. >> Also, when I open them, the path of the file in the current working copy >> is given to both sides of the external comparison tool (Beyond Compare 4), >> which then says "no differences". This at least is consistent with the >> wrong status, but it means you need to fix both. >> > > if your compare-tool doesn't show any differences, then there really are > no differences. > Also, the only way I can get a "normal (+)" status is by moving the parent > folder and then merge that. And in that case, the files really haven't been > modified. > > Also: if you right-click on the list control header, you can select more > columns, for example "text status" and "property status". Sometimes those > can show more info. > > Apart from that: I can't really show a "wrong" status here: if the svn lib > reports the status as "normal", TSVN has to show exactly that. What I will > do is change the color of an item with history, i.e. if the "(+)" is shown. > > There ARE differences if I compare the file from the original file (the one to be deleted) and the added and modified file. I only don't see differences if I start the file compare by double-clicking on the line with the added file, because from this line, the same path and filename is sent by TSVN as left and right file in the comparison. You should be able to reproduce it by changing the parent folder of a file AND modifying it (don't know whether the order of operations is relevant). Since you say that you just forward the status, it looks like the failure is in SVN library then. This really is a problem when reviewing the merge. I had hoped for a quick solution until tomorrow, but that has become unlikely. How can I give you more details about the issue? As suggested in the other issue, you may watch over teamviewer (contact me by email, knauss at schmoll-maschinen dot de). Third, the mentioned tooltip is shown at wrong positions. Take the "check >> for modifications" dialog, select a file and then hold the mouse over the >> status of another file. The tooltip will be shown at the selected file, >> which is wrong, because it doesn't belong there. Also, the tooltip is shown >> over the line of the file, it should be shown underneath. If you scroll a >> bit, then the tooltip may even be shown outside the window, or outside the >> screen. >> >> the position of the tooltips is determined by the list control itself, so > nothing I can do here, sorry. > This is annoying. You might want to use another list control, or just evaluate the mouse-hover event on that list control and calculate the correct position yourself. -- You received this message because you are subscribed to the Google Groups "TortoiseSVN" 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/c4fcc780-4a0d-4fb0-8e4e-816ec8f2a30en%40googlegroups.com.
