On Nov 5, 2013, at 12:00 PM, Richard Sandiford <rdsandif...@googlemail.com> wrote: > I've committed the patch below, which is a trivial wide-intification of: > > http://gcc.gnu.org/ml/gcc-patches/2013-11/msg00335.html > > I won't commit the mainline patch for a couple of days
So, please feel free to do a svn merge ^/trunk on the wide-int branch and bring in the trunk after you commit that work. You will be uniquely suited to resolve the conflicts that arise, and, if you merge right before you check it in, and then right after, the conflict resolutions should then be trivial in the second merge. Be sure to use a recent enough svn that tracks svn:mergeinfo, older ones didn't. Thanks.