Hi! I've successfully build the grid_color branch. But the interpretation
of the grid_color metadata is weird:
I can't make it to be 100% green!
If I enter: 0.000000 1.000000 0.000000
I get cyan. When I switch the grid off and then on, the metadata reflects
this:
0.000000 1.000000 1.000000
For some reason, parsing of metadata is not accurate or is not reading the
numbers in the right way
2013/9/19 Carlos López González <[email protected]>
> Yes, I've just make the commands I recommended you and obtain the same
> result.
> I'm sure that the pull request won't affect the master in a bad way but
> for your future references I will do this:
> First I will rebuild including your change to do a quick test. It is is ok
> (it will be) I would move to master and cherry pick your commit then I
> would send a pull request for the commit you made and it will be
> incorporated into master.
>
> From your side, I think that something has been made wrong when you cloned
> the repository. Possibly your local master started up far from old commits
> and when rebased needed to include all those commits.
>
> So my suggestion is:
> At github, remove your forked repository of Synfig. Then fork it again.
> Then at local repository clone again the code in other folder and start to
> code again from that folder.
> Once you get the local and remote repositories clean, keep them in sync by
> using git gui and gitk for most of the commands you can do. Please work in
> features in named branches so we can get some tracking of the merging by
> the name of the branch. Always try to do atomic commits that always build
> (it is not recommendable to have one commit that doesn't build because it
> makes difficult the later debugging). Start new features branches from
> origin/master (or from local master if it is in sync with remote). If
> origin/master grows up and you want to keep the feature branch always on
> top of master to be easily merged, just do:
>
> $ git checkout feature
> $ git rebase origin/master
> $ git push tsiouTsiou +feature
>
> The '+' is needed to force overwrite your branch.
> Carlos
>
>
> 2013/9/19 krista <[email protected]>
>
>> Although i still see the 175 commits from the master and i m not sure
>> what to do.
>>
>>
>> On 19/9/2013 8:24 πμ, krista wrote:
>>
>> Hi, i did exactly the steps you told me on my local repo without anything
>> more or less. Do i have to do anything else or am i able now to do the pull
>> request?
>>
>> Thanx for your help git seems a bit frustrating at first:)
>>
>> On 18/9/2013 11:34 ??, Carlos López González wrote:
>>
>> Hmm, in theory, github shows you the changed files, and looks like your
>> pull request only changes the files it should.
>> Anyway, could you try to resend the pull request as I explained?
>> I won't remove that first pull request until we fix the second.
>> Thanks!
>>
>> El miércoles, 18 de septiembre de 2013, Carlos López González escribió:
>>
>> Hi, in theory you don't need to do more things. We could merge your pull
>> request into master. The problem is that your pull request includes
>> several
>> commits from master that I'm not sure if they are really already merged
>> on
>> master or would mess it up.
>> In general, pull request allowed are those that start from the current
>> master. That would assure that the master history is linear and doesn't
>> include merge commits with conflict resolutions.
>> So in summary, to be able to accept your patch in the right way, you have
>> to rebase your branch onto master, and then request a pull request. This
>> way we can see exactly what does the pull request do, without need to
>> review 173 commits that could, or couldn't be already merged into master.
>> So, in summary, at the terminal type:
>>
>> $ git checkout master (this will checkout your local branch with the
>> changes)
>> $ git branch grid_color (this will create a branch with the proper name
>> for the feature)
>> $ git checkout grid_color (this will move to that branch)
>> $ git rebase origin/master (this command would rebase the commits of the
>> feature onto remote master branch, assuming that you named the remote
>> repository as 'origin'. If it has other name, change it.
>> $ git push tsiouTsiou grid_color (this would push your new branch with te
>> commits rebased onto master to your remote repository)
>>
>> Between commands use 'gitk --all' command to visualize that everything is
>> as expected, specially before push.
>>
>> If everything is ok, we could checkout, build and test easily before
>> merge.
>>
>> In case you get stuck, I would do those steps in a fork of your
>> repository
>> and would merge from it. But I want you to try yourself to be able to
>> repeat it more times. ;)
>> Good luck!
>>
>> El miércoles, 18 de septiembre de 2013, krista escribió:
>>
>> Hey Carlos,
>>
>> i created the pull request to my forked repository.
>> Do i have to do something else?
>> Thank you!
>>
>> On 18/9/2013 5:38 ??, Carlos López González wrote
>>
>> Hi!
>>
>> Can you push your changes to your forked synfig repository at GitHub to
>> guide you on the steps to follow to properly send the pull request?
>> Thanks!
>>
>> El miércoles, 18 de septiembre de 2013, krista escribió:
>>
>>
>> Hello everybody,
>>
>> First of all thanks genete for your help in the forum:) (
>> http://www.synfig.org/forums/viewtopic.php?f=22&t=4587)
>> For the rest, i tried to implement this issue
>> http://www.synfig.org/issues/thebuggeni
>> ... issues/238
>> <http://www.synfig.org/issues/thebuggenie/synfig/issues/238><http://www.synfig.org/issues/thebuggenie/synfig/issues/238>
>> <http://www.synfig.org/issues/thebuggenie/synfig/issues/238><http://www.synfig.org/issues/thebuggenie/synfig/issues/238>
>> through metadata panel.
>> I am sending you my first attempt with a patch because i didnt know if i
>> had to make a pull request already and how exactly i would do it.
>>
>> Tell me what you think
>> Krista
>>
>>
>>
>>
>>
>> ------------------------------------------------------------------------------
>>
>> LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
>> 1,500+ hours of tutorials including VisualStudio 2012, Windows 8,
>> SharePoint
>> 2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack
>> includes
>> Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13.
>> http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk
>>
>>
>>
>> _______________________________________________
>> Synfig-devl mailing
>> [email protected]https://lists.sourceforge.net/lists/listinfo/synfig-devl
>>
>>
>>
>> --
>> Carlos
>> http://synfig.org
>>
>>
>>
>>
>> ------------------------------------------------------------------------------
>>
>> LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
>> 1,500+ hours of tutorials including VisualStudio 2012, Windows 8,
>> SharePoint
>> 2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack
>> includes
>> Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13.
>>
>> http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk
>>
>>
>> _______________________________________________
>> Synfig-devl mailing list
>> [email protected]
>> https://lists.sourceforge.net/lists/listinfo/synfig-devl
>>
>>
>>
>>
>>
>> ------------------------------------------------------------------------------
>> LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
>> 1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
>> 2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack
>> includes
>> Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13.
>> http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk
>>
>>
>>
>> _______________________________________________
>> Synfig-devl mailing
>> [email protected]https://lists.sourceforge.net/lists/listinfo/synfig-devl
>>
>>
>>
>>
>> ------------------------------------------------------------------------------
>> LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
>> 1,500+ hours of tutorials including VisualStudio 2012, Windows 8,
>> SharePoint
>> 2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack
>> includes
>> Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13.
>>
>> http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk
>> _______________________________________________
>> Synfig-devl mailing list
>> [email protected]
>> https://lists.sourceforge.net/lists/listinfo/synfig-devl
>>
>>
>
>
> --
> Carlos
> http://synfig.org
>
--
Carlos
http://synfig.org
------------------------------------------------------------------------------
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13.
http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl
