Pawel,
FYI,
- Revert r168416, "Merging r168297 into 3.2 release branch"
- Pick up r167846 and r168297.
They can be applied cleanly. But two failures could be seen.
Failing Tests (2):
Clang :: Driver/rewrite-legacy-objc.m
Clang :: Driver/rewrite-objc.m
I wonder I have no idea in r168419, "Merging r168063 into 3.2 release branch",
whether to be fixed or reverted in release_32.
Chad, any idea?
...Takumi
2012/11/29 Pawel Wodnicki <[email protected]>:
> Takumi,
>
>> Pawel, it seems test/Driver/pic.c has not been fine on the release_32.
>>
>> Could you merge r168297 again? Or may I update release_32 instead?
>
> I know it is a bit irritating but I am still looking at the
> test/Driver/pic.c trying to figure out what went wrong.
>
>>
>> FYI, with git,
>>
>> a) git cherry-pick r168297 works.
>>
>> b) git revert r168297 && git cherry-pick r168297 works, too. :D
>
> Ok so r168297 works but we also need r167846 and I need to check
> if it breaks the test.
>
>>
>> (I have no idea about svn...)
>
> Can you commit to using git?
>
>>
>> ...Takumi
>
> Pawel
>
>>
>> 2012/11/27 Chad Rosier <[email protected]>:
>>>
>>> On Nov 26, 2012, at 10:50 AM, jahanian <[email protected]> wrote:
>>>
>>>>
>>>> On Nov 26, 2012, at 9:58 AM, Chad Rosier <[email protected]> wrote:
>>>>
>>>>> Fariborz,
>>>>> Due to another commit (i.e., r168297), it was necessary to merge your
>>>>> commit r168063 into the current release branch. Can you please confirm
>>>>> that this is something safe to pull into the branch? Also, would you
>>>>> mind looking at r168419 (i.e., the merge of r168063) to make sure that
>>>>> the merge looks clean?
>>>>
>>>> Chad,
>>>> As we talked off line, merge of my r168063 should be ok.
>>>
>>> Great, thanks Fariborz.
>>>
>>>> - Fariborz
>>>>
>>>>
>>>
>>> _______________________________________________
>>> cfe-commits mailing list
>>> [email protected]
>>> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>>
>>
>
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
