On Thu, Sep 01, 2016 at 01:02:53PM -0400, Wayne Stambaugh wrote: > Sorry it took so long. I took a look at Cirilo's changes an it looks > good. We still need a PKGBUILD file for msys2 with JPs patch so we > don't have to build oce from source. > > When I merge Cirilo's 3d-plugin branch and I had to create a commit > message which made me the commit author. This seems brain dead to me. > Here is the new commit log entry: > > commit 12c26047bffd54ccbb88348acfe7f653556450da > Merge: fcedef8 b656a81 > Author: Wayne Stambaugh <stambau...@gmail.com> > Date: Thu Sep 1 11:59:44 2016 -0400 > > Merge remote-tracking branch 'cirilo/3d-plugin' > > I really only want to show Cirilo's commit log entries as a new commit. > WTF! I'm liking git less every time I use it. What do I need to do to > get the correct commit history from Cirlo's 3d-plugin branch?
Uh... calm down, don't blame git, you're just misunderstanding it :P YOU ARE the author of the MERGE COMMIT. You did the merge. The authors of the commits that were merged should remain the same. If you don't want a merge commit to appear, look up "fast-forward merge", though those are often discouraged in this case. > > On 9/1/2016 7:35 AM, Nick Østergaard wrote: > > I would also like to see this merged (I have only tested the out of > > tree plugin), but I suggest that the build switch is named something > > prefixed with "KICAD_" like most other kicad specific build switches > > are, except for the github plugin. Maybe KICAD_USE_OCE. > > For the sake of consistency, we probably should prefix everything with > KICAD_. I always liked the autotools --with- and --enable- prefixes for > config options. There is no consistency as far as cmake goes. CMake > should have adopted a standard prefix naming convention for options. > > > > > And to that I will add that Documentation/development/compiling.md > > should be updated too to reflect the usage for that compile switch, :) > > Yes, we need to be keeping these up to date. > > > > > Nick > > > > 2016-09-01 11:39 GMT+02:00 Tomasz Wlostowski <tomasz.wlostow...@cern.ch>: > >> On 01.09.2016 10:30, Cirilo Bernardo wrote: > >>> Just a ping to remind devs of a branch introducing the OCE plugin: > >>> > >>> https://code.launchpad.net/~cirilo-bernardo/kicad/+git/kicad-oce/+merge/303513 > >>> > >>> Since the OCE plugin code must be activated with -DUSE_OCE=ON > >>> when configuring with CMake, I think it's safe to include this code. > >>> Having > >>> the code in the main base will make it easier for other volunteers to help > >>> sort out build and deployment issues of the OCE plugin on Windows and > >>> OSX. > >> > >> Hi Cirilo, > >> > >> I fully agree to merge the OCE plug-in code. Users have been desperately > >> asking for ages for STEP & IGES support in the 3d-viewer ;-) > >> > >> @Wayne/@Orson: since this is optional, are there any obstacles for the > >> merge? > >> > >> Cheers, > >> Tom > >> > >> _______________________________________________ > >> Mailing list: https://launchpad.net/~kicad-developers > >> Post to : kicad-developers@lists.launchpad.net > >> Unsubscribe : https://launchpad.net/~kicad-developers > >> More help : https://help.launchpad.net/ListHelp > > > > _______________________________________________ > > Mailing list: https://launchpad.net/~kicad-developers > > Post to : kicad-developers@lists.launchpad.net > > Unsubscribe : https://launchpad.net/~kicad-developers > > More help : https://help.launchpad.net/ListHelp > > > > _______________________________________________ > Mailing list: https://launchpad.net/~kicad-developers > Post to : kicad-developers@lists.launchpad.net > Unsubscribe : https://launchpad.net/~kicad-developers > More help : https://help.launchpad.net/ListHelp _______________________________________________ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
