Patches good to merge.

Tomaz Canabrava tcanabrava at
Tue May 20 15:24:14 PDT 2014

On Tue, May 20, 2014 at 1:02 PM, Tomaz Canabrava <tcanabrava at> wrote:
> On Tue, May 20, 2014 at 11:25 AM, Tomaz Canabrava <tcanabrava at> wrote:
>> On Tue, May 20, 2014 at 2:52 AM, Dirk Hohndel <dirk at> wrote:
>>> On Wed, May 14, 2014 at 10:51:10PM -0300, Tomaz Canabrava wrote:
>>>> So, I was looking at the profile today to port stuff the planner to
>>>> the new profile, but I couldn't, I was just fixing stuff that I looked
>>>> at there ( while I was thinking how to port the planner to the new
>>>> profile ), so no work was lost. :)
>>>> The 0002 and 0011 patches disables / reenables the planner ( as I
>>>> tougth at the beginning that I was just going to port it and not fix
>>>> anything... silly me. )
>>> Obviously I didn't take those two patches, nor did I take the ones that
>>> didn't apply to master (either now or before I pushed all the changes made
>>> on the boat). My guess is that you have some other planner code pulled
>>> into your tree that aren't in master.

Strange, I removed the master, recreated a clean branch and applyed,
here's the result:

tcanabra:subsurface/ (portPlannerToNewProfileâ) $ git branch -D master
Deleted branch master (was 1e25a7c).
tcanabra:subsurface/ (portPlannerToNewProfileâ) $ git checkout master
Branch master set up to track remote branch master from origin.
Switched to a new branch 'master'
tcanabra:subsurface/ (masterâ) $ git checkout -b portPlanner2
Switched to a new branch 'portPlanner2'
tcanabra:subsurface/ (portPlanner2â) $ git am 00*
Applying: Removed silly macro to pretend that we were doing things the
right way.
Applying: Started to port the Planner to the new profile code.
Applying: Only set the state to profile if it's empty, not if iits Add or Plan.
Applying: Changed the event-handlers to point-methods.
Applying: Created a 'remove event' function that removes an event
Applying: Speed Improv: hide events, instead of replotting everythign.
Applying: Speed Improv: Unhide all events by calling event->show()
instead of replot.
Applying: Code Cleanup: use the internal method to hide / show ruler.
Applying: Speedup: Do not replot the profile if on profile mode on
settings changed.
Applying: Code Cleanup: use qMin instad of if( min ) setMin else setMax.
Applying: Revert "Started to port the Planner to the new profile code."

where 'origin' is the github torvalds branch.

>>> And I didn't take the patch that in all caps pointed out that you didn't
>>> know what you were doing :-)
>>>> I think tomorrow I'll start really porting the planner as those other
>>>> patches kept me busy.
>>>> Dirk, please take a good look at the patches, as I don't program for
>>>> subsurface for quite a while, see if I didn't messed anything. ;)
>>> So five went in. And they went in under heavy cursing as you clearly lost
>>> all your settings for indentation and whitespace. I had to edit every
>>> single patch (I think).
>>> Tomaz, we went through this before. It's NOT HARD. But it makes my life as
>>> a maintainer a pain. PLEASE. Comply with our whitespace rules.
>> "oops"
>> Editing my configurations, do not want to make your life miserable. :)
>>> /D
> Dirk, I didn't see any of those commited into master, do you want me
> to rework them?

More information about the subsurface mailing list