[llvm-commits] svn assistance...

[Relph, Richard]

On Dec 19, 2012, at 3:47 PM, John Criswell <criswell at illinois.edu> wrote:

> On 12/19/12 5:28 PM, Relph, Richard wrote:
>> On Dec 19, 2012, at 2:59 PM, John Criswell <criswell at illinois.edu> wrote:
>> 
>>> 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?
>> Thanks for the reply, John.
>> Not a dumb question… Yes, I've tried that with similarly unsatisfactory results.
>> From my freshly-checked-out local working copy of AMDILBackend, I'm doing:
>> svn merge http://llvm.org/svn/llvm-project/llvm/trunk@167702
> 
> When you use svn merge, are the URLs you supply https, and do they have the same prefix as the one used for your working copy?

I'll give that a shot… For this particular set of experiments, I did not use https to check out, though.

> Try doing the merges with https, and try using the -r or -c options instead of the @ format (I've never used the @ format myself).

I'll try that, too.

> Other than that, I have no idea why you're seeing the conflicts that you're seeing.  If using an https URL doesn't work, please send me the name of the branch that you want to merge these changes into.  I can try doing the merge to see if the way I do things causes the same conflicts.

It's the AMDILBackend branch, but give me tonight to try your suggestions.

Thanks,
Richard