> On April 25, 2018, 4:07 p.m., Anthony Young-Garner wrote: > > dev-support/smart-apply-patch.sh > > Line 44 (original) > > <https://reviews.apache.org/r/66787/diff/1/?file=2011247#file2011247line44> > > > > Do we not still want to detect this situation (only new files) and try > > applying the patch at levels 0,1,2? (Lines 44 - 85) > > Steve Moist wrote: > No, we should just use git apply to be consistant. > > Alexander Kolbasov wrote: > A lot of people generate patches that are not applyable with git apply.
Do you have an example of it? - Steve ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/66787/#review201928 ----------------------------------------------------------- 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 > >
