> On April 25, 2018, 7:58 p.m., Sergio Pena wrote: > > I found out that Hive made a change on the smart-apply-patch.sh to use git > > apply instead of patch, and the patch still have some validation to check > > if the patch was generated using the --no-prefix and also the levels. > > See > > https://github.com/apache/hive/blob/master/testutils/ptest2/src/main/resources/smart-apply-patch.sh > > > > Should we do something similar? Just replace patch for git apply? or do you > > think it is not neccessary?
That looks pretty good, I'll take a look at it and why it's doing that instead of a straight git apply. - Steve ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/66787/#review201957 ----------------------------------------------------------- On April 24, 2018, 9:18 p.m., Steve Moist wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/66787/ > ----------------------------------------------------------- > > (Updated April 24, 2018, 9:18 p.m.) > > > Review request for sentry. > > > Repository: sentry > > > Description > ------- > > Removed using the patch command and instead am using "git apply" for diffs. > > > Diffs > ----- > > dev-support/smart-apply-patch.sh fce27354 > > > Diff: https://reviews.apache.org/r/66787/diff/1/ > > > Testing > ------- > > Used it to apply a patch, then tested with apply a patch with conflicts, > doing a dry-run. Also tested with rename/moves. > > > Thanks, > > Steve Moist > >
