Why not use `push -f` instead? xunzhang
2016-07-19 11:19 GMT+08:00 Radar Da lei <[email protected]>: > When I was merging Hong's commit 'HAWQ-933' to branch '2.0.0.0-incubating', > below 7 commits are merged by accidents. > > HAWQ-894. Add feature test for polymorphism with new test framework > HAWQ-808. Refactor feature test for external_oid with new framework. > HAWQ-894. Add missed answer file for polymorphism case > HAWQ-924. Refactor feature test for querycontext with new test framework > HAWQ-918. Fix memtuple forming bug when null-saved size is larger than > 32763 bytes > HAWQ-917. Refactor feature tests for data type check with new googletest > framework > HAWQ-896. Add feature test for create table with new test framework > > Sorry for the wrong merge, now I'm trying to revert these commits. But > revert so many commits looks ugly and will be confused, so I proposal let > me re-create the branch. The new created branch will be the same as before, > then the branch can keep clean. > > Any comments? Thanks. > > Regards, > Radar > > On Tue, Jul 19, 2016 at 10:35 AM, Hong Wu <[email protected]> wrote: > > > HAWQ-933 is fixed(69f3c9026892bc9c6937ed132fa45716d7912a8f > > < > > > https://github.com/apache/incubator-hawq/commit/69f3c9026892bc9c6937ed132fa45716d7912a8f > > >), > > thank you for pointing this out. I will cherry-pick it to > > 2.0.0.0-incubating soon. > > > > Best > > xunzhang > > > > 2016-07-19 4:47 GMT+08:00 Goden Yao <[email protected]>: > > > > > Filed a JIRA for these warnings. > > > > > > https://issues.apache.org/jira/browse/HAWQ-933 > > > Can someone who's familiar with gpnetbench* code, take a look and fix > > them > > > ? > > > > > > -Goden > > > > > > On Mon, Jul 18, 2016 at 11:04 AM Goden Yao <[email protected]> > wrote: > > > > > > > just compiled the latest from git pull. > > > > > > > > Build was successful with a few warnings, we probably want to make > them > > > > clean. > > > > > > > > gpnetbenchClient.c:36:6: warning: no previous prototype for function > > > 'usage' [-Wmissing-prototypes] > > > > void usage() > > > > ^ > > > > gpnetbenchServer.c:34:6: warning: no previous prototype for function > > > 'usage' [-Wmissing-prototypes] > > > > void usage() > > > > ^ > > > > gpnetbenchClient.c:198:14: warning: comparison of unsigned > expression < > > > 0 is always false [-Wtautological-compare] > > > > if (retval < 0) > > > > ~~~~~~ ^ ~ > > > > gpnetbenchClient.c:231:6: warning: no previous prototype for function > > > 'print_headers' [-Wmissing-prototypes] > > > > void print_headers() > > > > ^ > > > > gpnetbenchClient.c:33:6: note: this declaration is not a prototype; > add > > > 'void' to make it a prototype for a zero-parameter function > > > > void print_headers(); > > > > ^ > > > > void > > > > 1 warning generated. > > > > 3 warnings generated. > > > > > > > > On Mon, Jul 18, 2016 at 3:28 AM Radar Da lei [email protected] > > > > <http://mailto:[email protected]> wrote: > > > > > > > > I have merged fixes for 'HAWQ-622', 'HAWQ-926', 'HAWQ-915' into > > > >> '2.0.0.0-incubating' branch. > > > >> > > > >> There seems no blocker issues left. > > > >> > > > >> > > > >> Regards, > > > >> Radar > > > >> > > > >> On Sat, Jul 16, 2016 at 5:05 AM, Goden Yao <[email protected]> > > wrote: > > > >> > > > >> > Thanks Alan. > > > >> > > > > >> > Just a reminder - when you do commits in master, please check the > > JIRA > > > >> > associated with it and if it's labeled "2.0.0.0-incubating" in fix > > > >> version, > > > >> > please port your commits to the release branch and close the JIRA. > > > >> > > > > >> > I can see in the past a couple days, > > > >> > > > > >> > - HAWQ-915 <https://issues.apache.org/jira/browse/HAWQ-915> > RAT > > is > > > >> > failing on the latest maste > > > >> > - HAWQ-926 <https://issues.apache.org/jira/browse/HAWQ-926> > > Remove > > > >> > pycrypto from source code > > > >> > > > > >> > They're both needed in this release but I don't see them being > > ported > > > to > > > >> > the release branch and as the JIRAs stay open, I'm not sure if the > > > >> > assignees plan to augment the commits or not. > > > >> > > > > >> > Please check. thank you. > > > >> > > > > >> > -Goden > > > >> > > > > > > > > > > > > > >
