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? >
You're right. BC4 does not save if nothing has changed. I confirmed that by doing unnecessary edits and then save it; "mark as resolved" was then enabled again. However, BC4 DOES provide a save button when the merge window is opened for the first time, and that save button is visible right from the start, even if no edit was made yet. This makes me wonder what is different on the first merge vs. the following merges. There must be a difference between the first and the following calls. Maybe BC4 checks the timestamps as well, because the command line arguments are identical on both calls. -- 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/f348e661-8768-4f54-9cc5-40c60efaa98c%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
