Just to confirm, I've gone back and re-installed 1.14.0 again and now my merging is back to normal again so it's definitely something in 1.14.1.
On Tuesday, 23 February 2021 at 21:09:32 UTC Kieren wrote: > Hey, > > I'm getting this error a lot when merging after the latest TortoiseSVN > update and having to update each time then re-merge. This can happen on the > same checkout minutes apart after just merging to it. Is there an easy way > for me to fix this? > > I've seen comments elsewhere of using "--allow-mixed-revisions" but > haven't been able to get this to work when adding it to a TortoiseProc > shortcut, nor find a setting for this (using the Windows interface). > > As far as I can tell they aren't mixed checkouts, have switched them to > make sure, updated with Omit Externals, tried re-checking out (happens on > different/all branches I have checked out anyway). > > Help would be appreciated, otherwise I may try go back to the previous > TortoiseSVN version as it's only started doing this after updating to: > TortoiseSVN 1.14.1, Build 29085 - 64 Bit , 2021/02/09 16:17:02 > > Cheers > -- 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/50a1ad1b-6f9e-48e7-a9b4-00ebaaa0d039n%40googlegroups.com.
