Am Freitag, 7. September 2018 17:01:41 UTC+2 schrieb Stefan: > > The button gets disabled first when the dialog is created. > And it is disabled every time you click the "edit text conflict" button. > > When you click the "edit text conflict" button, the last-write-time of the > target merge file is stored. The button gets enabled again only if that > last-write-time changes. So maybe BC4 doesn't actually save the file if you > don't make any changes? >
This week I had to do a lot of merging, and I encountered the issue again. Therefore I decided to investigate further when it happens again. This time I can prove that BC4 saved the file, but TSVN did not enable "Mark as resolved". Here's a file that I just edited after merging. The timestamp has changed, as you can see: The content of the file has changed for sure. Here's a file that has not beed edited yet: Do you need any logs of TSVN? Should I enable Debug mode? Regards Tobias -- 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/8cd6d4c9-1f84-44d6-ab30-a96818ac4f23%40googlegroups.com.
