Branko Čibej wrote: > On 13.02.2015 19:57, Ben Reser wrote: >> On 2/13/15 10:07 AM, Julian Foad wrote: >>> Ben, you currently have a veto recorded against 1.7.x backport r1643074 >>> - load with invalid mergeinfo: >> >> I removed my veto but it doesn't merge: >> >> $ svn merge ^/subversion/branches/1.7.x-r1643074 . >> svn: E195016: Reintegrate can only be used if revisions 1643188 through >>1659644 >> were previously merged from >> https://svn.apache.org/repos/asf/subversion/branches/1.7.x to the >>reintegrate >> source, but this is not the case: >> >> subversion/branches/1.7.x-r1643074/subversion/tests/libsvn_repos/repos-test.c >> Missing ranges: >> >> /subversion/branches/1.7.x/subversion/tests/libsvn_repos/repos-test.c:1643189,1643986 > > The svn-backport-conflicts-1.7.x builder is red now; possibly related?
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. - Julian
