One of the main problems where this affects me is having a large number of people using a checkout, if there's something I need to revert I used to be able to just update those specific files then revert and commit to the main repo folder quite quickly, but because of this error I now have to fully update the folder adding quite a bit of time to getting sorted and those reverts out fast.
Just a bit surprised there isn't an option to stop or ignore this error from coming up if we want to choose not to worry this for a folder, as it doesn't mind after we update it anyway - would this be easy to add? It just seems a bit frustrating to get this error every time I go to commit now, even if there's nothing new in an update. Cheers, Kieren On Friday, March 12, 2021 at 11:50:27 PM UTC+13 [email protected] wrote: > fredag 12 mars 2021 kl. 11:31:30 UTC+1 skrev DutchPavlo: > >> It is very nerving. We oft merging a lot of revisions at one time from >> development to our quality trunk. The merges have to been done seperate to >> insure the possibility too take them back or merge them too trunks of >> clients. After each merge you have too update the repository. Why is this >> not done by the merge? > > > This was a design decision by the Subversion project (back in 2000-2001 > when Subversion was created) that you can have "mixed revison working > copies". Some background can be found in the SVN book: > > > http://svnbook.red-bean.com/en/1.7/svn.basic.in-action.html#svn.basic.in-action.mixedrevs > > I've tested this out and I get the error message but I *also* get a > helper diaog "Shall I update the working copy and retry?". If I run the > update the merge will be retried and it succeeds for me. So I think > TortoiseSVN is doing what it can to help. > > If you really don't want mixed revision WCs then you can probably create a > post-commit hook script that do svn update in the wc. YMMV. > > Kind regards, > Daniel Sahlberg > -- 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/16dc7035-775c-4769-8760-4859984b7739n%40googlegroups.com.
