Hi!
I've detected a build error in release mode because the bones branch had
some degub functions that were not enclosed between debug preprocessor
directives and uses member functions that were available only in debug
mode. I've fixed the missing preprocessor directives and added it to
master.
Please rebase your branches to make them possible build in release mode.
Cheers!
2013/5/22 Carlos López González <[email protected]>
> Hi!
> This is the log of the resulting commands to fix the cairo_pending and
> master branches. It is curious that every time I follow the same
> instructions the git rebase command complains on trailing whitespace on
> different commits, first time was at the commit for duplicate layer, then
> for the commit for plant layer and finally the complain is at where posted
> below. Weird, isn't it?
> Anyway, I've fixed the cairo_pending applying to master by doing a rebase.
> I hope that the log could help anyone else.
> Cheers!
>
> ========================
> iMac:synfig carlos$ git checkout master
> Already on 'master'
> iMac:synfig carlos$ git reset --hard
> 4b1dad7d051b43cb0c0c4bee80252dff9ca4e4e9
> HEAD is now at 4b1dad7 Merge branch 'genete_bones' into 'master' branch
> iMac:synfig carlos$ git checkout cairo_pending
> Switched to branch 'cairo_pending'
> iMac:synfig carlos$ git rebase master
> First, rewinding head to replay your work on top of it...
> Applying: Fix bug #369: Motion blur not implemented in Cairo
> Applying: Fix bug #412 - Radial Blur not implemented in Cairo
> Applying: Fix bug #405 - Cairo render ignores gamma from setup
> Applying: Forgot to destroy Cairo context after used in a previous commit.
> Applying: Fix bug #413 - Curve gradient not implemented in Cairo
> Applying: Partially fix bug #416 - Some layers implemented only via
> get_color in Cairo.
> Applying: Partially fix bug #416 - Some layers implemented only via
> get_color in Cairo. (II)
> Applying: Completely fix bug #416 - Some layers implemented only via
> get_color in Cairo. (II)
> Applying: Fix bug #414 - Sphere distort not full y implemented in Cairo
> Applying: Plant Layer: move the drawing stuff to a external function to
> simplify code.
> Applying: Fix bug #411 - Plant layer not implemented in Cairo
> Applying: Fix bug #410 - Duplicate layer not implemented in Cairo
> Applying: Fix bug #370 - ListImporter doesn't work in Cairo
> Using index info to reconstruct a base tree...
> M synfig-core/src/synfig/Makefile.am
> <stdin>:264: trailing whitespace.
> warning: 1 line adds whitespace errors.
> Falling back to patching base and 3-way merge...
> error: Your local changes to the following files would be overwritten by
> merge:
> synfig-core/po/POTFILES.in
> synfig-core/src/synfig/Makefile.am
> Please, commit your changes or stash them before you can merge.
> Aborting
> Failed to merge in the changes.
> Patch failed at 0013 Fix bug #370 - ListImporter doesn't work in Cairo
> The copy of the patch that failed is found in:
> /Users/carlos/Software/Synfig/synfig/.git/rebase-apply/patch
>
> When you have resolved this problem, run "git rebase --continue".
> If you prefer to skip this patch, run "git rebase --skip" instead.
> To check out the original branch and stop rebasing, run "git rebase
> --abort".
>
> iMac:synfig carlos$ git apply
> /Users/carlos/Software/Synfig/synfig/.git/rebase-apply/patch
> /Users/carlos/Software/Synfig/synfig/.git/rebase-apply/patch:264: trailing
> whitespace.
> warning: 1 line adds whitespace errors.
> iMac:synfig carlos$ git add --all
> iMac:synfig carlos$ git rebase --continue
> Applying: Fix bug #370 - ListImporter doesn't work in Cairo
> Applying: Fix bug #436 - Preview render - Cairo On - Quality5 - "ghost
> lines appear". Disable using high level Cairo API for Outlines on quality >
> 6
> Applying: Remove unused variables
> iMac:synfig carlos$ git checkout master
> Switched to branch 'master'
> Your branch is behind 'ghorigin/master' by 16 commits, and can be
> fast-forwarded.
> (use "git pull" to update your local branch)
> iMac:synfig carlos$ git merge cairo_pending
> Updating 4b1dad7..f44be3c
> Fast-forward
> synfig-core/po/POTFILES.in | 2 +
> synfig-core/src/modules/lyr_std/sphere_distort.cpp | 211
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
> synfig-core/src/modules/lyr_std/sphere_distort.h | 9 +--
> synfig-core/src/modules/mod_example/filledrect.cpp | 92
> ++++++++++++++++++++++++
> synfig-core/src/modules/mod_example/filledrect.h | 31 +++++----
> synfig-core/src/modules/mod_example/simplecircle.cpp | 62
> +++++++++++++++++
> synfig-core/src/modules/mod_example/simplecircle.h | 23 +++---
> synfig-core/src/modules/mod_filter/radialblur.cpp | 164
> +++++++++++++++++++++++++++++++++++++++++++
> synfig-core/src/modules/mod_filter/radialblur.h | 1 +
> synfig-core/src/modules/mod_geometry/advanced_outline.cpp | 2 -
> synfig-core/src/modules/mod_geometry/outline.cpp | 4 +-
> synfig-core/src/modules/mod_geometry/region.cpp | 2 -
> synfig-core/src/modules/mod_gradient/curvegradient.cpp | 58
> ++++++++++++++++
> synfig-core/src/modules/mod_gradient/curvegradient.h | 7 +-
> synfig-core/src/modules/mod_gradient/spiralgradient.cpp | 59
> ++++++++++++++++
> synfig-core/src/modules/mod_gradient/spiralgradient.h | 29 ++++----
> synfig-core/src/modules/mod_particle/plant.cpp | 181
> +++++++++++++++++++++++++++++++++++++++---------
> synfig-core/src/modules/mod_particle/plant.h | 47
> +++++++------
> synfig-core/src/modules/mod_png/mptr_cairo_png.cpp | 5 +-
> synfig-core/src/modules/mod_png/trgt_cairo_png.cpp | 2 +-
> synfig-core/src/synfig/Makefile.am | 6 +-
> synfig-core/src/synfig/cairolistimporter.cpp | 219
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> synfig-core/src/synfig/cairolistimporter.h | 94
> +++++++++++++++++++++++++
> synfig-core/src/synfig/layer_duplicate.cpp | 61
> ++++++++++++++++
> synfig-core/src/synfig/layer_duplicate.h | 1 +
> synfig-core/src/synfig/layer_motionblur.cpp | 150
> ++++++++++++++++++++++++++++++++++++++++
> synfig-core/src/synfig/layer_motionblur.h | 1 +
> synfig-core/src/synfig/layer_polygon.cpp | 2 -
> synfig-core/src/synfig/listimporter.cpp | 11 +--
> synfig-core/src/synfig/listimporter.h | 9 ++-
> synfig-core/src/synfig/main.cpp | 2 +
> synfig-core/src/synfig/surface.cpp | 18 +++--
> synfig-core/src/synfig/target_cairo.cpp | 35 +++++-----
> synfig-core/src/synfig/target_cairo.h | 2 +-
> synfig-core/src/synfig/target_cairo_tile.cpp | 35 +++++-----
> synfig-core/src/synfig/target_cairo_tile.h | 2 +-
> synfig-studio/src/gui/docks/dock_navigator.cpp | 2 +-
> synfig-studio/src/gui/preview.cpp | 2 +-
> synfig-studio/src/gui/workarea.cpp | 4 +-
> 39 files changed, 1484 insertions(+), 163 deletions(-)
> create mode 100644 synfig-core/src/synfig/cairolistimporter.cpp
> create mode 100644 synfig-core/src/synfig/cairolistimporter.h
> iMac:synfig carlos$ git push -f ghorigin master
> Counting objects: 192, done.
> Delta compression using up to 4 threads.
> Compressing objects: 100% (140/140), done.
> Writing objects: 100% (140/140), 23.00 KiB, done.
> Total 140 (delta 125), reused 0 (delta 0)
> To [email protected]:synfig/synfig.git
> + 1d9472e...f44be3c master -> master (forced update)
> iMac:synfig carlos$ git push -f ghorigin cairo_pending
> Total 0 (delta 0), reused 0 (delta 0)
> To [email protected]:synfig/synfig.git
> + e8fae85...f44be3c cairo_pending -> cairo_pending (forced update)
>
>
>
> 2013/5/22 Carlos López González <[email protected]>
>
>> Thank you very much for the detailed instructions for the correct rebase
>> operations. I tried to do a rebase using the SourceTree application but for
>> some reason it refused to apply the action I made. Curiously doing the same
>> on your branches I was able to do an interactive rebasing for your
>> branches, specially the ones from jcome that comes from long back in time.
>> Possibly I didn't do the right commands on the application. I'll do your
>> suggested changes using the command line and then will let you know.
>> Cheers!
>>
>>
>> 2013/5/22 Konstantin Dmitriev <[email protected]>
>>
>>> Hi!
>>>
>>> That's a great news, Carlos!
>>>
>>> 2013/5/22 Carlos López González <[email protected]>:
>>> > I apologize for not apply that recommendations to my own branch
>>> > (cairo_pending) but I wasn't able to rebase it properly since it was
>>> pushed
>>> > to the same repository than bones and so, I don't know how to rebase
>>> it.
>>>
>>> Rebase operation isn't related to the fact if branches belong to the
>>> same repository or not.
>>> As the note for the future, the steps to rebase cairo_pending branch:
>>> git checkout cairo_pending
>>> git rebase master
>>> # the cairo pending is starts at master now
>>> # We can't send pull request, because we are in the same repo. But we
>>> can do a plain merge instead:
>>> git checkout master
>>> git merge cairo_pending # Fast-forward merge will happen, because
>>> cairo_pending starts from master!
>>> # Push the changes:
>>> git push origin master
>>> git push -f origin cairo_pending
>>>
>>> That's it. ^__^
>>>
>>> You can fix the current situation and undo your merge with the
>>> following commands:
>>>
>>> # undo changes
>>> git checkout master
>>> git reset --hard 4b1dad7d051b43cb0c0c4bee80252dff9ca4e4e9 # reset to
>>> "bones_merge" branch
>>> # do the rebase operations properly (described above)
>>> git checkout cairo_pending
>>> git rebase master
>>> git checkout master
>>> git merge cairo_pending
>>> # launch gitk and carefully review if everything is fine ^___^
>>> # then push changes:
>>> git push -f origin master
>>> git push -f origin cairo_pending
>>>
>>> Cheers!
>>> K.
>>>
>>>
>>>
>>>
>>> --
>>> http://morevnaproject.org/
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> Try New Relic Now & We'll Send You this Cool Shirt
>>> New Relic is the only SaaS-based application performance monitoring
>>> service
>>> that delivers powerful full stack analytics. Optimize and monitor your
>>> browser, app, & servers with just a few lines of code. Try New Relic
>>> and get this awesome Nerd Life shirt!
>>> http://p.sf.net/sfu/newrelic_d2d_may
>>> _______________________________________________
>>> Synfig-devl mailing list
>>> [email protected]
>>> https://lists.sourceforge.net/lists/listinfo/synfig-devl
>>>
>>
>>
>>
>> --
>> Carlos
>> http://synfig.org
>>
>
>
>
> --
> Carlos
> http://synfig.org
>
--
Carlos
http://synfig.org
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl
