Looks fine to me. David
On Thu, Nov 22, 2012 at 11:06 AM, Konstantin Serebryany <konstantin.s.serebry...@gmail.com> wrote: > Anything else? > > On Thu, Nov 22, 2012 at 6:42 AM, Konstantin Serebryany > <konstantin.s.serebry...@gmail.com> wrote: >> Added to README.gcc: >> The merges from upstream should be done with the aid of the merge.sh script; >> it will also update the file MERGE to contain the upstream revision >> we merged with. >> >> >> On Wed, Nov 21, 2012 at 11:03 PM, Xinliang David Li <davi...@google.com> >> wrote: >>> How about also documenting this in README.gcc? >>> >>> David >>> >>> On Wed, Nov 21, 2012 at 10:56 AM, Kostya Serebryany <k...@google.com> wrote: >>>> Done both. >>>> >>>> >>>> +fatal() { >>>> + echo "$1" >>>> + exit 1; >>>> +} >>>> + >>>> +pwd | grep 'libsanitizer$' || \ >>>> + fatal "Run this script from libsanitizer dir" >>>> >>>> >>>> +rm -rf upstream >>>> >>>> >>>> >>>> >>>> >>>> On Wed, Nov 21, 2012 at 10:49 PM, Xinliang David Li <davi...@google.com> >>>> wrote: >>>>> Suggestions: >>>>> >>>>> 1) make sure current local dir is libsanitizer -- exit if it is not >>>>> 2) clean up the upstream directory after the merge is done. >>>>> >>>>> David >>>>> >>>>> >>>>> On Wed, Nov 21, 2012 at 10:25 AM, Kostya Serebryany <k...@google.com> >>>>> wrote: >>>>>> Hi, >>>>>> >>>>>> A dummy script to help merging asan from upstream. >>>>>> Not 100% complete, but should be enough to complete the current merge. >>>>>> >>>>>> You suggestions on how to improve it (or how to do w/o it) are welcome, >>>>>> but I really wish to do the first merge tomorrow to unblock other folks. >>>>>> >>>>>> Thanks, >>>>>> --kcc