kicad-developers team mailing list archive

[Wayne Stambaugh <stambaughw@xxxxxxxxxxx>]

On 5/25/2012 2:24 AM, Lorenzo Marcantonio wrote:
> On Thu, May 24, 2012 at 10:03:21PM -0400, Wayne Stambaugh wrote:
> > compiling and I didn't apply patch 002 because of Dick's comments.
>
> What was the problem with 002?
>
> Anyway, stop at 21, since 22 is broken. Some are independent, other
> obviously not. For example, backing off 22 requires rollback of
> 23,24,25 while 26 and 27 are separated from it.
> (separating 'cleanly' wires from buses and notes *is* difficult...)
> 23 in fact would completely fail after the 'variable bus width' (which
> partly replicates...)
>
> Apply what you can and I should have no problem regenerating them
> against the 'tip' (I did more difficult thing in the past :P)
Here is the output from patch -p0 --dry-run < 004-status_flags.diff

patching file common/base_struct.cpp
patching file common/class_undoredo_container.cpp
patching file eeschema/bus-wire-junction.cpp
patching file eeschema/busentry.cpp
patching file eeschema/class_libentry.cpp
Hunk #1 succeeded at 1206 (offset 5 lines).
Hunk #2 succeeded at 1250 (offset 5 lines).
Hunk #3 succeeded at 1261 (offset 5 lines).
Hunk #4 succeeded at 1337 (offset 5 lines).
Hunk #5 succeeded at 1351 (offset 5 lines).
Hunk #6 succeeded at 1365 (offset 5 lines).
patching file eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp
patching file eeschema/edit_bitmap.cpp
patching file eeschema/edit_label.cpp
patching file eeschema/events_called_functions_for_edit.cpp
patching file eeschema/getpart.cpp
patching file eeschema/lib_arc.cpp
patching file eeschema/lib_arc.h
patching file eeschema/lib_circle.cpp
patching file eeschema/lib_circle.h
patching file eeschema/lib_draw_item.h
patching file eeschema/lib_field.cpp
patching file eeschema/lib_field.h
patching file eeschema/lib_pin.cpp
patching file eeschema/lib_polyline.cpp
patching file eeschema/lib_polyline.h
patching file eeschema/lib_rectangle.cpp
patching file eeschema/lib_rectangle.h
patching file eeschema/lib_text.cpp
patching file eeschema/lib_text.h
patching file eeschema/libeditframe.cpp
patching file eeschema/onrightclick.cpp
patching file eeschema/pinedit.cpp
patching file eeschema/sch_bitmap.cpp
patching file eeschema/sch_bus_entry.cpp
patching file eeschema/sch_component.cpp
patching file eeschema/sch_junction.cpp
patching file eeschema/sch_line.cpp
Hunk #1 succeeded at 436 (offset -1 lines).
patching file eeschema/sch_marker.cpp
patching file eeschema/sch_no_connect.cpp
patching file eeschema/sch_sheet.cpp
patching file eeschema/sch_text.cpp
patching file eeschema/schedit.cpp
patching file eeschema/sheet.cpp
patching file eeschema/sheetlab.cpp
patching file eeschema/symbdraw.cpp
patching file eeschema/symbedit.cpp
patching file include/base_struct.h
patching file include/class_undoredo_container.h
patching file pcbnew/attribut.cpp
Hunk #2 FAILED at 74.
1 out of 3 hunks FAILED -- saving rejects to file pcbnew/attribut.cpp.rej
patching file pcbnew/block_module_editor.cpp
patching file pcbnew/class_drawsegment.cpp
patching file pcbnew/class_track.cpp
patching file pcbnew/class_track.h
patching file pcbnew/clean.cpp
Hunk #1 FAILED at 303.
Hunk #2 FAILED at 319.
Hunk #3 FAILED at 359.
Hunk #4 FAILED at 375.
Hunk #5 FAILED at 499.
Hunk #6 FAILED at 537.
Hunk #7 FAILED at 700.
Hunk #8 FAILED at 742.
Hunk #9 FAILED at 751.
9 out of 9 hunks FAILED -- saving rejects to file pcbnew/clean.cpp.rej
patching file pcbnew/connect.cpp
Hunk #1 FAILED at 989.
1 out of 1 hunk FAILED -- saving rejects to file pcbnew/connect.cpp.rej
patching file pcbnew/deltrack.cpp
Hunk #1 FAILED at 212.
1 out of 1 hunk FAILED -- saving rejects to file pcbnew/deltrack.cpp.rej
patching file pcbnew/dialogs/dialog_global_deletion.cpp
patching file pcbnew/dialogs/dialog_pad_properties.cpp
patching file pcbnew/dialogs/dialog_pcb_text_properties.cpp
patching file pcbnew/dimension.cpp
patching file pcbnew/drag.h
patching file pcbnew/dragsegm.cpp
Hunk #2 FAILED at 129.
1 out of 3 hunks FAILED -- saving rejects to file pcbnew/dragsegm.cpp.rej
patching file pcbnew/edgemod.cpp
patching file pcbnew/edit_pcb_text.cpp
patching file pcbnew/edit_track_width.cpp
Hunk #1 FAILED at 175.
1 out of 1 hunk FAILED -- saving rejects to file 
pcbnew/edit_track_width.cpp.rej
patching file pcbnew/editedge.cpp
patching file pcbnew/editrack-part2.cpp
patching file pcbnew/editrack.cpp
Hunk #2 FAILED at 181.
Hunk #3 FAILED at 195.
Hunk #4 FAILED at 258.
Hunk #5 FAILED at 494.
Hunk #8 FAILED at 1028.
Hunk #9 FAILED at 1046.
Hunk #10 FAILED at 1069.
Hunk #11 FAILED at 1084.
8 out of 11 hunks FAILED -- saving rejects to file pcbnew/editrack.cpp.rej
patching file pcbnew/edtxtmod.cpp
patching file pcbnew/globaleditpad.cpp
patching file pcbnew/legacy_plugin.cpp
Hunk #1 FAILED at 1662.
Hunk #2 FAILED at 1922.
2 out of 2 hunks FAILED -- saving rejects to file 
pcbnew/legacy_plugin.cpp.rej
patching file pcbnew/loadcmp.cpp
patching file pcbnew/mirepcb.cpp
patching file pcbnew/modedit_onclick.cpp
patching file pcbnew/modules.cpp
Hunk #2 FAILED at 125.
Hunk #4 FAILED at 182.
Hunk #5 FAILED at 280.
Hunk #7 FAILED at 411.
4 out of 8 hunks FAILED -- saving rejects to file pcbnew/modules.cpp.rej
patching file pcbnew/move-drag_pads.cpp
Hunk #1 FAILED at 51.
Hunk #4 FAILED at 367.
2 out of 4 hunks FAILED -- saving rejects to file 
pcbnew/move-drag_pads.cpp.rej
patching file pcbnew/move_or_drag_track.cpp
Hunk #1 FAILED at 139.
Hunk #13 FAILED at 891.
Hunk #14 FAILED at 906.
Hunk #17 FAILED at 1029.
Hunk #18 FAILED at 1047.
5 out of 18 hunks FAILED -- saving rejects to file 
pcbnew/move_or_drag_track.cpp.rej
patching file pcbnew/onrightclick.cpp
patching file pcbnew/solve.cpp
Hunk #1 FAILED at 1166.
Hunk #2 FAILED at 1193.
Hunk #3 FAILED at 1305.
3 out of 3 hunks FAILED -- saving rejects to file pcbnew/solve.cpp.rej
patching file pcbnew/tr_modif.cpp
Hunk #2 FAILED at 65.
Hunk #3 FAILED at 103.
Hunk #4 FAILED at 152.
Hunk #5 FAILED at 162.
Hunk #6 FAILED at 179.
Hunk #7 FAILED at 197.
Hunk #8 FAILED at 207.
Hunk #9 FAILED at 223.
Hunk #12 FAILED at 266.
Hunk #13 FAILED at 282.
10 out of 14 hunks FAILED -- saving rejects to file pcbnew/tr_modif.cpp.rej
patching file pcbnew/zones_by_polygon.cpp

Wayne