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 Ochotnicky <sochotnicky@xxxxxxxxxx> Software Engineer - Base Operating Systems Brno PGP: 7B087241 Red Hat Inc. http://cz.redhat.com -- packaging mailing list packaging@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/packaging
