Re: Query about package versioning

2014-02-21 Thread Kevin Kofler
Vivek Goyal wrote: What is fast forwarding commits from f21 to f20. I guess you are saying there are bunch of commits in master branch and you want to now apply those commits to f20 branch too? Fast-forwarding is git jargon for doing a merge that simply accepts ALL commits from master into

Query about package versioning

2014-02-20 Thread Vivek Goyal
Hi All, We are trying to sort out how to do kexec-tools package version, release number management in fedora across various branches, hence this query. I quickly went through following. https://fedoraproject.org/wiki/Packaging:NamingGuidelines#Package_Naming_and_Versioning_Guidelines So far we

Re: Query about package versioning

2014-02-20 Thread Marcin Juszkiewicz
W dniu 20.02.2014 17:16, Vivek Goyal pisze: So instead of increasing release number on released branches, why don't we append additional number after dist and bump that up in released branch. So FC21 releases will look like. kexec-tools-2.0.4-24.fc21.1 kexec-tools-2.0.4-24.fc21.2

Re: Query about package versioning

2014-02-20 Thread Mikolaj Izdebski
On 02/20/2014 05:16 PM, Vivek Goyal wrote: So instead of increasing release number on released branches, why don't we append additional number after dist and bump that up in released branch. So FC21 releases will look like. kexec-tools-2.0.4-24.fc21.1 kexec-tools-2.0.4-24.fc21.2 ...

Re: Query about package versioning

2014-02-20 Thread Mikolaj Izdebski
On 02/20/2014 05:28 PM, Marcin Juszkiewicz wrote: W dniu 20.02.2014 17:16, Vivek Goyal pisze: So instead of increasing release number on released branches, why don't we append additional number after dist and bump that up in released branch. So FC21 releases will look like.

Re: Query about package versioning

2014-02-20 Thread Vivek Goyal
On Thu, Feb 20, 2014 at 05:28:02PM +0100, Marcin Juszkiewicz wrote: W dniu 20.02.2014 17:16, Vivek Goyal pisze: So instead of increasing release number on released branches, why don't we append additional number after dist and bump that up in released branch. So FC21 releases will look

Re: Query about package versioning

2014-02-20 Thread Vivek Goyal
On Thu, Feb 20, 2014 at 05:39:17PM +0100, Mikolaj Izdebski wrote: On 02/20/2014 05:28 PM, Marcin Juszkiewicz wrote: W dniu 20.02.2014 17:16, Vivek Goyal pisze: So instead of increasing release number on released branches, why don't we append additional number after dist and bump that up

Re: Query about package versioning

2014-02-20 Thread Michael Schwendt
On Thu, 20 Feb 2014 17:28:02 +0100, Marcin Juszkiewicz wrote: W dniu 20.02.2014 17:16, Vivek Goyal pisze: So instead of increasing release number on released branches, why don't we append additional number after dist and bump that up in released branch. So FC21 releases will look like.