tisdag 21 maj 2024 kl. 02:25:59 UTC+2 skrev Kieren: For some reason when using the command line merge for some of my repositories it regularly requires a cleanup, sometimes 2 or 3 times before I can get a merge through.
I've then noticed using explorer to do the merge with the same info will go through on the first try - even after it's right after trying with the command line trigger and it asking to be cleaned. So I can only assume it's something to do with this method. ie, cmd command I'm using for merges: TortoiseProc.exe /command:merge /path:"%to_path%" /fromurl:%merge_from% /revrange:"%svn_list%" 2 What is the "2" doing at the end of the line? I can't recall it being part of the standard command line. Which for some of my repos works fine, but then others (seems to be the ones with larger files) ask for cleanup almost every time unless done through the explorer right click -> merge method. I'm aware of the svn environment variable and commands too, but for usability purposes within my team the UI is very helpful. Cheers, Kieren There are no obvious reasons why a merge using your command should require a cleanup if a merge from the context menu doesn't. If you right click -> merge and then (without completing or closing the merge dialog) check Task manager on the details tab you will find a TortoiseProc.exe process and if you add the Command line column you will see that it is quite similar. The fromurl and revrange only pre-populate the corresponding text boxes in the merge wizard and it shouldn't make a difference to the actual merge if those came from the command line or if you entered them manually. Kind regards Daniel -- 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 tortoisesvn+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/2e99762d-e09b-40b7-b1e2-bf5c1098f6f0n%40googlegroups.com.
