Re: 1.7.x backport r1643074 - load with invalid mergeinfo - resolve the veto
From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Sat, 14 Feb 2015 11:25:56 +0000
Branko Čibej wrote:
The merge problem probably originates from me having a sparse WC when I did the merges on the branch. But after a few quick tries just now I wasn't able to untangle it: simply making the WC complete (svn up --set-depth infinity) and doing another catch-up merge didn't behave as I expected and instead created conflicts in files such as repos-test.c that are already caught up. I'm not sure what's going on.
For now, I've veto'd the nomination again because of this.
I may have to recreate the branch from scratch. That will probably have to wait till Monday.
This is an archived mail posted to the Subversion Dev mailing list.