Git questions

classic Classic list List threaded Threaded
3 messages Options
hou
Reply | Threaded
Open this post in threaded view
|

Git questions

hou

Hello,

I am an active user of GRAMPS and software developer from Slovakia. I thought I might contribute to the project, starting with updating the Slovak translation. I would like to ask some questions that came up during my first attempt of commiting a little fix. I read through the articles on the developers portal, so I hope this is the right place to ask.

I forked the git repository, commited a fix to the sk.po translation file in master branch: https://sourceforge.net/u/ondrisko/gramps/ci/5aa8c4a295516b6109be39a0053fb7dd72b00968/

I requested a merge, which seems to be already done: https://sourceforge.net/p/gramps/source/ci/ab58ca890eef50ef14ef2e52bc1ba747573f2dfb/

My question is, why is the commit still in my Pending Merges?
I'd also like to ask what is the correct way to commit such fixes to all the active versions, 3.4.x, 4.0.x, as well as 4.1.x. Why there is a maintenance branch for version 4.1.? As I understand it, 4.1. is developed in master branch.

Should I make the fix in maintenance/gramps34, maintenance/gramps40, and also maintenance/gramps41? Is cherrypicking the usual way to do this or should I make separate commit?

Also, is it OK to make such fixes without first reporting them to the bug tracker, or should this allways be done?

 

Thank you,

Best regards,

 

Ondrej Krc


------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|

Re: Git questions

jerome
Hello,

Thanks for the contribution.

We merged fix on gramps41/master and Nick has just fixed gramps34/gramps40 branches! So, I think it is OK.

Note, merge a translation file - even via git - between multiple branches, is sometimes complexe. No problem for your fix.

Your question lets me remember that a '3.4.8' release is also pending...
Maybe before this summer?


Best regards,
Jérôme

Le ven. 23 mai 2014 at 9:55, [hidden email] a écrit :

Hello,

I am an active user of GRAMPS and software developer from Slovakia. I thought I might contribute to the project, starting with updating the Slovak translation. I would like to ask some questions that came up during my first attempt of commiting a little fix. I read through the articles on the developers portal, so I hope this is the right place to ask.

I forked the git repository, commited a fix to the sk.po translation file in master branch: https://sourceforge.net/u/ondrisko/gramps/ci/5aa8c4a295516b6109be39a0053fb7dd72b00968/

I requested a merge, which seems to be already done: https://sourceforge.net/p/gramps/source/ci/ab58ca890eef50ef14ef2e52bc1ba747573f2dfb/

My question is, why is the commit still in my Pending Merges?
I'd also like to ask what is the correct way to commit such fixes to all the active versions, 3.4.x, 4.0.x, as well as 4.1.x. Why there is a maintenance branch for version 4.1.? As I understand it, 4.1. is developed in master branch.

Should I make the fix in maintenance/gramps34, maintenance/gramps40, and also maintenance/gramps41? Is cherrypicking the usual way to do this or should I make separate commit?

Also, is it OK to make such fixes without first reporting them to the bug tracker, or should this allways be done?

 

Thank you,

Best regards,

 

Ondrej Krc


------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|

Re: Git questions

Nick Hall
In reply to this post by hou
Ondrej,

Welcome to the Gramps development list.

The release of Gramps v4.1 is scheduled for 28th May.  This is why we have created the gramps41 branch.  The master branch is now available for v4.2 development.

I have completed the merge of your commit, and updated the request accordingly.

We haven't been using git for very long, and you are only the second person to submit a merge request.  This is why the procedure isn't documented.

I don't see much point in creating a bug report.  All discussion should be in one place.  For simple changes, we can cherry-pick, but for bigger changes separate branches would be easier.

Nick.


On 23/05/14 08:55, [hidden email] wrote:

Hello,

I am an active user of GRAMPS and software developer from Slovakia. I thought I might contribute to the project, starting with updating the Slovak translation. I would like to ask some questions that came up during my first attempt of commiting a little fix. I read through the articles on the developers portal, so I hope this is the right place to ask.

I forked the git repository, commited a fix to the sk.po translation file in master branch: https://sourceforge.net/u/ondrisko/gramps/ci/5aa8c4a295516b6109be39a0053fb7dd72b00968/

I requested a merge, which seems to be already done: https://sourceforge.net/p/gramps/source/ci/ab58ca890eef50ef14ef2e52bc1ba747573f2dfb/

My question is, why is the commit still in my Pending Merges?
I'd also like to ask what is the correct way to commit such fixes to all the active versions, 3.4.x, 4.0.x, as well as 4.1.x. Why there is a maintenance branch for version 4.1.? As I understand it, 4.1. is developed in master branch.

Should I make the fix in maintenance/gramps34, maintenance/gramps40, and also maintenance/gramps41? Is cherrypicking the usual way to do this or should I make separate commit?

Also, is it OK to make such fixes without first reporting them to the bug tracker, or should this allways be done?

 

Thank you,

Best regards,

 

Ondrej Krc




------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel