On 09/11/2012 12:37 PM, Stanislav Ochotnicky wrote:
Quoting Germán A. Racca (2012-09-11 17:03:51)
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?
git merge master is the best (IMO) approach here. It will mean you will
clearly have the same spec file in all supported releases (same git
hash since it will be fast-forward merge).
What some people don't like is that F16/17 git history will contain
mention of F18 mass rebuild, but that is (again IMO) a very minor
"issue".
Stanislav, I liked your answer, many thanks for clarifying my doubts!
It's going to be this way.
--
Germán A. Racca
Fedora Package Maintainer
https://fedoraproject.org/wiki/User:Skytux
--
packaging mailing list
packaging@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/packaging
