[llvm-commits] AMDILBackend merge info cleanup

[Relph, Richard]

It seems that our intern didn't quite do what I predicted he'd done. He'd done something different, though still not correct. Now it feels like he created the branch (r161674), did a merge (r163732), then did another merge (r164634), but included with that merge a "manual" modification of all of the files (well, ALMOST all of the files) back to where they were at 161674. So the repo thinks we have 164634+a ton of branch changes, when in reality we have 161674+a very small number of branch changes. This has been making our attempts to merge in LLVM 3.2 (or trunk or anything) a nightmare.

So this patch mostly updates the merge history in the repo. And one file that somehow got out of sync. We generated this diff with:
svn merge --accept theirs-full -r HEAD:161674 ^/trunk
and then to resolve the conflicts SVN thinks we had as a result of the manual modification…
svn resolve -R --accept working .

Once we get this in, we think doing svn merges will go much more smoothly… we hope… it is Christmas, right? ;-)

Approved?



-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20121221/f70d820b/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: patch
Type: application/octet-stream
Size: 1176 bytes
Desc: patch
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20121221/f70d820b/attachment.obj>