kicad-developers team mailing list archive

[Clemens Koller <cko@xxxxxxxxx>]

Hello, Michael!

Is there a git branch which can be pulled to test your patches?

By a quick look, I was wondering if you intentionally kept backup
copies (or temporary files) of some files or if that's was a mistake?

See: 1-move-pns-into-namespace-pns.patch, line 1451ff

-----8<-----
diff --git a/pcbnew/router/pns_node.cpp.orig b/pcbnew/router/pns_node.cpp.orig
new file mode 100644
index 0000000..8fe69ff
--- /dev/null
+++ b/pcbnew/router/pns_node.cpp.orig
@@ -0,0 +1,1340 @@
+/*
+ * KiRouter - a push-and-(sometimes-)shove PCB router
+ *
+ * Copyright (C) 2013-2014 CERN
-----8<-----

And we have some unresolved merge conflicts in the .orig file.
See: 1-move-pns-into-namespace-pns.patch, line 1995ff
-----8<-----
+<<<<<<< HEAD
+    addSolid( aSolid.release() );
+=======
+    aSolid->SetOwner( this );
+    addSolidIndex( aSolid.release() );
+>>>>>>> 0371f40... remove garbage items functionality (delete removed items early)
+}
+
+void NODE::addViaIndex( VIA* aVia )
+{
+    linkJoint( aVia->Pos(), aVia->Layers(), aVia->Net(), aVia );
+    m_index->Add( aVia );
+}
+
+void NODE::Add( std::unique_ptr< VIA > aVia )
+{
+<<<<<<< HEAD
+    addVia( aVia.release() );
+=======
+    aVia->SetOwner( this );
-----8<-----

This should not be necessary when we have SCM.
You might want to clean up your patches...

Regards,

Clemens


On 2016-09-01 18:12, Michael Steinberg wrote:
> Hello,
> 
> as part of my efforts on the pns-router some refactoring patches are 
> attached. Prefix-numbers indicate the patch order.
> The router is moved into namespace PNS, some places are decorated with 
> unique_ptr usage, some code quality improvements and then some 
> refactorings in preparation for future improvements which are in the 
> pipeline.
> A batch of experimental patches will follow shortly. My sincere hopes of 
> not breaking anything are attached implicitly.
> 
> Cheers!
> Michael
> 
> 
> 
> _______________________________________________
> Mailing list: https://launchpad.net/~kicad-developers
> Post to     : kicad-developers@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~kicad-developers
> More help   : https://help.launchpad.net/ListHelp
>