[llvm-commits] svn assistance...

[John Criswell]

On 12/19/12 4:53 PM, Relph, Richard wrote:
>      I'm stuck behind a firewall with no IRC access.
>      I want to bring the AMDILBackend branch in sync with the LLVM 3.2 branch.
>      I'm NOT an SVN expert… I can check out, and check in, but mass merges across branches with a common base are well beyond my capabilities. That it should be possible seems obvious… how… not so much.
>      The AMDILBackend branch on llvm.org was branched from trunk at r161674. Since that time, in AMDILBackend, we've made almost no changes outside the new lib/Target/AMDIL backend directory itself, and the related test/CodeGen/AMDIL. The LLVM 3.2 branch branched from trunk at r167702 and has had several changes to it since then.
>      Because the LLVM 3.2 branch was made after the AMDILBackend branch, I thought it would be relatively straight forward to do this, but alas, I haven't found the correct incantation to get SVN to do the trick.
>      svn merge <3.2 URL> seems the most likely choice. But when I tried that I was surprised by the number of "conflicts" that svn reported, in files that had not changed in the AMDILBackend branch at all since the branch from trunk.
>      I'd appreciate some help to save me having to spend several hours (or days, given my reading speed) to learn SVN to do what I'm sure will be a 15-minute task which I won't repeat often enough to have it "stick".

Dumb question: have you tried to svn merge from revision 161674 to 
revision 167702 first and then tried merging in the release_32 branch?

That's what I did with SAFECode clang.

-- John T.

> Thanks,
> Richard
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits