Re: [Kicad-developers] Stable release bug fixes.

[Wayne Stambaugh]

Michael,

Thanks for the effort.  Sorry I sent you on a wild goose chase.  I guess
we will have to live with 1.60 as the maximum version of boost for the
stable release.  This shouldn't be too much of an issue except for
possibly our package devs.  Hopefully there will not be too many more
stable 4 releases.

Cheers,

Wayne

On 7/5/2016 6:11 PM, Michael Steinberg wrote:
> Hello Wayne,
> 
> Am 05.07.2016 um 17:14 schrieb Wayne Stambaugh:
>> While I'm on the subject @Michael, would you please back port your boost
>> context 1.61 patch?  I'm sure at some point in the not too distant
>> future, someone will try to build stable version 4 against boost 1.61.
> After having spent the last few hours with building Kicad stable 4, I
> investigated the backporting. I fear I will be unable to backport
> boost::context 1.61 compatiblity to stable under the restriction of
> c++03, as the library specifies c++11 as minimum (it uses 
> and  now f.e.). So I'm feeling a bit unfortunate. It might be
> possible to come up with a hack for this particular version using the
> detail namespace. I don't know if that's okay by the policy and it could
> break with any new version. It could be that it's less work than I fear,
> by simply retargeting the detail namespace, but I would only investigate
> if that's an option at all.
> 
> Michael
> 
> 
> ___
> 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

Re: [Kicad-developers] Stable release bug fixes.

[Michael Steinberg]

Hello Wayne,

Am 05.07.2016 um 17:14 schrieb Wayne Stambaugh:

While I'm on the subject @Michael, would you please back port your boost
context 1.61 patch?  I'm sure at some point in the not too distant
future, someone will try to build stable version 4 against boost 1.61.
After having spent the last few hours with building Kicad stable 4, I 
investigated the backporting. I fear I will be unable to backport 
boost::context 1.61 compatiblity to stable under the restriction of 
c++03, as the library specifies c++11 as minimum (it uses  
and  now f.e.). So I'm feeling a bit unfortunate. It might be 
possible to come up with a hack for this particular version using the 
detail namespace. I don't know if that's okay by the policy and it could 
break with any new version. It could be that it's less work than I fear, 
by simply retargeting the detail namespace, but I would only investigate 
if that's an option at all.


Michael


___
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

Re: [Kicad-developers] Stable release bug fixes.

[Chris Pavlina]

Patching against stable and then merging forward sounds like a much better
development strategy to me, I second this idea very much. :)

On Jul 5, 2016 11:16, "Wayne Stambaugh"  wrote:

> As the development branch diverges from the stable release branch, it is
> becoming difficult to merge patch commits from the development branch to
> the stable branch.  I don't have that kind of time to clean up, build,
> and test the merge conflicts.  The problem has gotten much worse since
> we've started to incorporate C++11 code.  I'm going ask that in the
> future, if a bug affects the both the stable release and development
> branches, please create a bug fix patch for the stable release branch
> and then attempt to merge it forward into the development branch and
> then send a separate patch for the development branch if it does not
> merge cleanly.  This will save me a lot of grief.  Please note, no C++11
> code is allowed in the stable branch.  Thank you in advance for your
> cooperation.
>
> While I'm on the subject @Michael, would you please back port your boost
> context 1.61 patch?  I'm sure at some point in the not too distant
> future, someone will try to build stable version 4 against boost 1.61.
>
> Thanks,
>
> Wayne
>
> ___
> 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

[Kicad-developers] Stable release bug fixes.

[Wayne Stambaugh]

As the development branch diverges from the stable release branch, it is
becoming difficult to merge patch commits from the development branch to
the stable branch.  I don't have that kind of time to clean up, build,
and test the merge conflicts.  The problem has gotten much worse since
we've started to incorporate C++11 code.  I'm going ask that in the
future, if a bug affects the both the stable release and development
branches, please create a bug fix patch for the stable release branch
and then attempt to merge it forward into the development branch and
then send a separate patch for the development branch if it does not
merge cleanly.  This will save me a lot of grief.  Please note, no C++11
code is allowed in the stable branch.  Thank you in advance for your
cooperation.

While I'm on the subject @Michael, would you please back port your boost
context 1.61 patch?  I'm sure at some point in the not too distant
future, someone will try to build stable version 4 against boost 1.61.

Thanks,

Wayne

___
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

Re: [Kicad-developers] Stable release bug fixes.

[Nick Østergaard]

Sounds like sane recommendations to me. :)

2016-06-01 14:19 GMT+02:00 Wayne Stambaugh :
> I've been running into issues with merging bug fixes into the 4 stable
> branch.  This is to be expected as the code bases diverge.  However,
> some of the merge issues are due to new code being committed along with
> the bug fix which causes merge conflicts.  Please try to commit only the
> code required to fix a bug that applies to both the stable and product
> branches.  This is not an issue when fixing bugs that only apply to the
> product branch.  This makes my life a lot easier when merging the
> commits from the product branch into the stable branch.  Even better
> would be to test your commit by merging it into a local copy of the
> stable branch and verify that it merges cleanly and builds.  Also, I am
> loosing track of which fixes effect the stable branch since the bug
> reports are not always clear and sometimes there is no bug report for
> the fix.  Please either add a note in commit message that it effects the
> stable branch or send me a email with the commit number so I know to
> merge it into the stable branch.
>
> Thanks,
>
> Wayne
>
> ___
> 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

[Kicad-developers] Stable release bug fixes.

[Wayne Stambaugh]

I've been running into issues with merging bug fixes into the 4 stable
branch.  This is to be expected as the code bases diverge.  However,
some of the merge issues are due to new code being committed along with
the bug fix which causes merge conflicts.  Please try to commit only the
code required to fix a bug that applies to both the stable and product
branches.  This is not an issue when fixing bugs that only apply to the
product branch.  This makes my life a lot easier when merging the
commits from the product branch into the stable branch.  Even better
would be to test your commit by merging it into a local copy of the
stable branch and verify that it merges cleanly and builds.  Also, I am
loosing track of which fixes effect the stable branch since the bug
reports are not always clear and sometimes there is no bug report for
the fix.  Please either add a note in commit message that it effects the
stable branch or send me a email with the commit number so I know to
merge it into the stable branch.

Thanks,

Wayne

___
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