[llvm-commits] svn assistance...

[Tom Stellard]

On Wed, Dec 19, 2012 at 10:53:20PM +0000, 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".

I am not an SVN expert either.  I usually use git svn, so if you are
familiar with git that would be my recommendation.  No matter which 
VCS system you use I would recommend the following:

1. Generate a diff of all the non-AMDIL backend files that have changed
   in the AMDILBackend branch since r161674.
2. Apply the diff in reverse (effectively reverting these changes) and
   save the diff for later.
3. Break this diff into logical patches and submit to llvm-commits for
   review. ;)
4. Merge the LLVM 3.2 branch into the AMDILBackend branch.  If there are
   conflicts, just take whatever came from the 3.2 branch.
5. Now the AMDILBackend branch should be 3.2 + the AMDIL backend.  To
   verify this, do a diff between the AMDILBackend branch and the 3.2
   branch.
6. Apply the patch you created in step 1 to the AMDILBackend branch and
   then you should be done.

Hope this helps.

-Tom

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