On Tue, Sep 11, 2012 at 10:32 AM, "Germán A. Racca"
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(a)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
>> 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
>> branches if I "git merge master", then the release will jump from 2 to
>> 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.
> In f18, you would git merge master. In f17, git merge f18. In
> 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?
OTOH, if I choose to jump from 2 to 4 in f17/16 branches, I only need
edit spec file in master branch, bump the spec file to 4, and then only git
merge master in the lower branches, right?
>> All the best,
>> Germán A. Racca
>> Fedora Package Maintainer
>> packaging mailing list
Germán A. Racca
Fedora Package Maintainer
packaging mailing list
in your fear, seek only peace
in your fear, seek only love