Hi!
In the current master branch of my development repository I've rebased the
following changes:
Fix bug #450: fixing this bug has implied to rewrite all the Cairo render
system.
Remove unused: this branch fixes several compiler warning due to unused
variables. It also replaces some auto tool macros that were deprecated.
Fix bug #461: I've been lucky on find the root cause and although I used
the workaround to fix it, we do know know why is it produced. See the
commit explanation.
Also there is a unmerged branch called param-interpolation that I have
developed based on a initial work of Zelgadis of the same branch on its
repository. I've tried to rebase that branch onto master or onto
intermediate commits of the master branch but I always get conflicts and I
different lines. It talks sometimes about trailing white spaces and always
mention that my local changes will be overwritten by merge and that I need
to stash my changes before merge. Them it leaves me the HEAD of the
repository with some commits rebased but not all the complete branch, and
it does that always at different commits.
I've tested to cherry pick commits and discover what's the conflictive one
but I would like that someone else tries to do a rebase before I do that.
It is ok if you don't do it, but I want to know if I'm doing something
wrong. To work on my repository you should possibly need to add it as
remote in your repo, pull and then try to rebase param-interpolation onto
master, everything on genete repo.
Thanks!
--
Carlos
http://synfig.org
------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent
caught up. So what steps can you take to put your SQL databases under
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl
