On 20 August 2014 13:44, yann jautard <[email protected]> wrote: > just FYI, 5084 does not compile any more. > > /home/yann/kicad_sources/kicad.bzr/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp: > In member function ‘virtual void > DIALOG_MODULE_BOARD_EDITOR::OnCancelClick(wxCommandEvent&)’: > /home/yann/kicad_sources/kicad.bzr/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp:185:1: > error: expected primary-expression before ‘<<’ token > <<<<<<< TREE > ^ > /home/yann/kicad_sources/kicad.bzr/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp:185:3: > error: expected primary-expression before ‘<<’ token > <<<<<<< TREE > ^ > > and at least 50 more lines similar to this one. > > looking at the problematic file, found some pretty strange syntax wich I > guess it is not c++ : > > void DIALOG_MODULE_BOARD_EDITOR::OnCancelClick( wxCommandEvent& event ) > { > <<<<<<< TREE > EndQuasiModal( -1 ); > ======= > ENDQUASIMODAL( -1 ); >>>>>>>> MERGE-SOURCE > } > > > > looks like some patching as not finished properly or something similar. > Hi Yann,
There's nothing wrong with the source, see: http://bazaar.launchpad.net/~kicad-product-committers/kicad/product/view/head:/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp You have a locally unresolved conflict because you've had some local changes that BZR cannot resolve without your help. See http://doc.bazaar.canonical.com/beta/en/user-guide/resolving_conflicts.html You can check the status to see the unresolved conflicts by using the bzr status command. Best Regards, Brian. _______________________________________________ Mailing list: https://launchpad.net/~kicad-developers Post to : [email protected] Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
