[Fedora-packaging] version-release for different branches

[Jon Ciesla]

On Tue, Sep 11, 2012 at 10:32 AM, "Germán A. Racca"
<german.racca at gmail.com> wrote:
> On 09/11/2012 12:13 PM, Jon Ciesla wrote:
>>
>> On Tue, Sep 11, 2012 at 10:03 AM, "Germán A. Racca"
>> <german.racca at gmail.com> wrote:
>>>
>>> Hi list,
>>>
>>> I have the following situation. I have a package whose version-release in
>>> f17/16 is 0.1.14-2, but in f18/master branches it is 0.1.14-3 (because of
>>> a
>>> f18 mass rebuild). Suppose I'm going to update the spec file, so in
>>> f18/master branches the new version-release will be 0.1.14-4, and for
>>> f17/16
>>> branches if I "git merge master", then the release will jump from 2 to 4.
>>> Is
>>> this ok? Or should I keep working with different releases for different
>>> branches and forget about "git merge master" in lower branches?
>
>
> Thanks Jon for your quick answer.

NP.

>> In f18, you would git merge master.  In f17, git merge f18.  In f16,
>> git merge f17.  But jumping from 2 to 4 is fine, too.
>
>
> This way of doing git merge from a previous branch to the actual one implies
> modifying the spec file in f18/master branches to change version from 3 to
> 4, and in f17/16 branches to change version from 2 to 3, right?

Yes.

> OTOH, if I choose to jump from 2 to 4 in f17/16 branches, I only need to
> edit spec file in master branch, bump the spec file to 4, and then only git
> merge master in the lower branches, right?

Yes.

-J

> Germán.
>
>> -J
>>>
>>> All the best,
>>> Germán.
>>>
>>> --
>>> Germán A. Racca
>>> Fedora Package Maintainer
>>> https://fedoraproject.org/wiki/User:Skytux
>>> --
>>> packaging mailing list
>>> packaging at lists.fedoraproject.org
>>> https://admin.fedoraproject.org/mailman/listinfo/packaging
>>
>>
>>
>>
>
>
> --
> Germán A. Racca
> Fedora Package Maintainer
> https://fedoraproject.org/wiki/User:Skytux
> --
> packaging mailing list
> packaging at lists.fedoraproject.org
> https://admin.fedoraproject.org/mailman/listinfo/packaging



-- 
http://cecinestpasunefromage.wordpress.com/
------------------------------------------------
in your fear, seek only peace
in your fear, seek only love

-d. bowie