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?
FYI, with git, a) git cherry-pick r168297 works. b) git revert r168297 && git cherry-pick r168297 works, too. :D (I have no idea about svn...) ...Takumi 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
