kicad-developers team mailing list archive

[Oliver Walters <oliver.henry.walters@xxxxxxxxx>]

Wayne,

I'm at a loss too. git am fails on 0002 but git apply works fine on each
individual patch.

On Mon, Nov 20, 2017 at 3:29 AM, Wayne Stambaugh <stambaughw@xxxxxxxxx>
wrote:

> Oliver,
>
> Still no luck.  Did you possible do something to mess up the commit
> ordering?  I am applying these patches on top a clean master branch so
> I'm not sure what is going on here.  I'm getting the following error
> from `git am` when I attempt to merge patch 2:
>
> Applying: Toggle LIB_TABLE_ROW enabled/disabled in grid editor
> error: patch failed: eeschema/dialogs/dialog_sym_lib_table.cpp:350
> error: eeschema/dialogs/dialog_sym_lib_table.cpp: patch does not apply
> error: patch failed: include/lib_table_grid.h:32
> error: include/lib_table_grid.h: patch does not apply
> Patch failed at 0001 Toggle LIB_TABLE_ROW enabled/disabled in grid editor
> The copy of the patch that failed is found in: .git/rebase-apply/patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
>
> If any one has any ideas, I'm open to suggestion.  If these patches were
> generated properly, there should be no issues applying them.
>
> Cheers,
>
> Wayne
>
> On 11/18/2017 07:11 PM, Oliver Walters wrote:
> > Wayne
> >
> > Please find updated patch set attached. I have rebased and built from
> > commit b6884d and it all works fine.
> >
> > Thanks
> >
> > On Sun, Nov 19, 2017 at 4:42 AM, Wayne Stambaugh <stambaughw@xxxxxxxxx
> > <mailto:stambaughw@xxxxxxxxx>> wrote:
> >
> >     Oliver,
> >
> >     I just tried to apply your patches and ran into some issues.  Patch 1
> >     applies but patch 2 fails.  Would you please rebase your patches so I
> >     can get them merged as soon as possible.
> >
> >     Thanks,
> >
> >     Wayne
> >
> >     On 11/15/2017 06:41 AM, Oliver Walters wrote:
> >     > Wayne, et al,
> >     >
> >     > I am really liking the way that the new symbol table works! Thanks
> for
> >     > the huge effort that has gone into this.
> >     >
> >     > One thing that I have noticed is that when opening (for e.g.) the
> >     > component chooser, the UI hangs while all the libraries load.
> Previously
> >     > there was a progress dialog which at least informed the user what
> was
> >     > going on.
> >     >
> >     > I have re-implemented this dialog in the attached patch set.
> >     >
> >     > Further, I have also implemented a way to individually enable /
> disable
> >     > each row in the library tables (this works for SYMBOL_LIB and
> FP_LIB).
> >     >
> >     > This is based on the idea by Tomasz. Example screenshot below:
> >     >
> >     > Inline image 1
> >     >
> >     > I have tweaked the base LIB_TABLE_GRID code such that disabled
> entries
> >     > are greyed out and made italic. The enabled / disabled status is
> >     > persistent in the sym/fp_lib_table files. Older version of
> xxx_lib_table
> >     > files are read with all rows enabled by default.
> >     >
> >     > Please find patch set attached.
> >     >
> >     > Regards,
> >     > Oliver
> >     >
> >     >
> >     >
> >     > _______________________________________________
> >     > Mailing list: https://launchpad.net/~kicad-developers
> >     <https://launchpad.net/~kicad-developers>
> >     > Post to     : kicad-developers@xxxxxxxxxxxxxxxxxxx
> >     <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx>
> >     > Unsubscribe : https://launchpad.net/~kicad-developers
> >     <https://launchpad.net/~kicad-developers>
> >     > More help   : https://help.launchpad.net/ListHelp
> >     <https://help.launchpad.net/ListHelp>
> >     >
> >
> >     _______________________________________________
> >     Mailing list: https://launchpad.net/~kicad-developers
> >     <https://launchpad.net/~kicad-developers>
> >     Post to     : kicad-developers@xxxxxxxxxxxxxxxxxxx
> >     <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx>
> >     Unsubscribe : https://launchpad.net/~kicad-developers
> >     <https://launchpad.net/~kicad-developers>
> >     More help   : https://help.launchpad.net/ListHelp
> >     <https://help.launchpad.net/ListHelp>
> >
> >
>