Stefan schrieb am Montag, 14. Dezember 2020 um 18:08:54 UTC+1: > On Monday, December 14, 2020 at 10:46:57 AM UTC+1 Tobias Knauss wrote: > >> Stefan schrieb am Freitag, 11. Dezember 2020 um 19:28:24 UTC+1: >> >>> try r29039 >> >> >> Did you compile and test the changes yourself before you published them >> as a new nightly build? I don't want to be rude, but it just looks like you >> didn't. >> > > Of course I did. But I can stop doing that any time. > > No, you should not stop testing, please enhance your testing instead. I am happy about the new functionality, but it's a bit frustrating when testing on the user's end reveals different problems after each update. This, and your words "try ..." instead of your usual "solved in ..." made me think that you maybe did not have enough time for tests.
The updates and colours work again after reopening "merge conflicts", but I found that after reopening "merge conflicts", the dialog "fetching tree conflict information" does not show anymore or with delay, and is sometimes opened behind the "merge conflicts" dialog. It is shown in the taskbar, but cannot be brought into the foreground, so I also cannot click it's abort button on long-lasting operations. Right now it is in the foreground, but I cannot click "abort" anymore. And when clicking on the "merge conflicts" dialog, the "fetching tree conflicts" is in the background again and stays there. Seems like that whole dialog does not react anymore, because even after selecting it by ALT+Tab, the space bar (which should click the abort button), does not work. >> I tested all options and found that each of them can be used again. >> However I did *not* take the time to test whether the chosen options are >> applied correctly, because I am confident that this part still works. >> But I found other things that seem to be broken: >> - The color of the conflicting lines used to turn green after a solution >> for a conflict was chosen. This is no longer the case, the color stays red. >> - The status line does not update. After resolving all conflicts, it >> still says "conflicted:80, ..." >> - "Jump to next conflict" is still shown and cycles through all lines of >> previously conflicting files. >> So it looks like the entire GUI is not updated. >> > > Sorry, forgot to enable the interacting resolving mode when re-starting > the resolving. > > This part is working again, as written above. -- 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/9a5d8271-f199-46e9-8d87-c1ef0f3d8d46n%40googlegroups.com.
