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/aa88613a-9f61-423c-9539-09cb36e56b7dn%40googlegroups.com.
