[Fix committed] The /closeonend parameter seems to be ignored for at least some uses of /command:merge

[Kevin Lyles]

When running a command of the form:

TortoiseProc.exe /command:merge /closeonend:2 /path:<target working path> /fromurl: <merge source URL>[ /revrange:<list of revisions>]

(we run it with revisions sometimes and without other times)

The merge popup opens as expected, and the merge works after I click Next and then Merge.  However, the merge progress popup stays open even after the merge finishes with no conflicts. Based on https://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-automation.html, I expected the popup to close in this scenario.  I've also tried all other values (0-4) for the closeonend parameter, with the same results.

After a (very) cursory look through the TortoiseSVN source code, it appears that MergeCommand.cpp never calls progDlg.SetAutoClose(parser), unlike many of the other commands.  I haven't yet taken the time to try adding the call and see if that would fix my issue, but I can look into doing that if it would be helpful.

Please let me know if there's any other information that would be useful.

[Stefan]

On Wednesday, April 8, 2020 at 7:50:42 PM UTC+2, Kevin Lyles wrote:

After a (very) cursory look through the TortoiseSVN source code, it appears that MergeCommand.cpp never calls progDlg.SetAutoClose(parser), unlike many of the other commands.  I haven't yet taken the time to try adding the call and see if that would fix my issue, but I can look into doing that if it would be helpful.

Good catch!

Fixed in r28840

Stefan

[Kevin Lyles]

Wow.  That might be a new record for reported to fixed time.  Thank you!

[Stefan]

On Wednesday, April 8, 2020 at 8:07:47 PM UTC+2, Kevin Lyles wrote:

Wow.  That might be a new record for reported to fixed time.  Thank you!

well, you did most of the work: you figured out where the bug is.

Fixing it then took only a minute.

:)