-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On Wed, 21 Jan 2009 10:47:45 +0100 Miroslav Suchý <msu...@redhat.com> wrote:
> Mike McCune wrote: > > If I tag a release in the SPACEWALK-0.4 release branch: > > > > http://git.fedorahosted.org/git/spacewalk.git?p=spacewalk.git;a=commit;h=1ac7a83c472b8b6bf45bb54b6477c3c825254401 > > > > > > > > Do I need to push any of that into master? If not, won't the > > versions get out of date in master (behind the release branch)? > > If you tag package in SPACEWALK-0.4 you will get another 0.4 version > - 0.4.17-1 in your case. > When you make some changes in master after branching you should bump > up version number - to 0.5.0 in this case. Then after you tag the > package you will get 0.5.1-1 version. > That is everything perfect. > > The scenario when you hit some problem is when you tag release in > SPACEWALK-0.4 branch (and you will get 0.4.17-1) and then you forgot > to bump up version in master you tag there release as well and you > will get 0.4.17-1 as well. But either git pull or git push --tags > will stop you since you can not have one tag for two different > commits. Therefore it is nearly impossible to do things wrong. > I actually tried to tag java 0.4.17 in master this morning and forgot to bump up to 0.5. I had already git pulled so it quickly died because that tag already existed. I'll add a remote repo check in build.py to run before doing anything as well. Devan - -- Devan Goodwin <dgood...@redhat.com> Software Engineer Spacewalk / RHN Satellite Halifax, Canada 650.567.9039x79267 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) iEYEARECAAYFAkl3KKwACgkQAyHWaPV9my7bkgCfS6D0B48WrVz0wBPO2qTar8ip Gq4An2VO6y/WGnuIjyShP8R+jNvFWpY0 =qxkf -----END PGP SIGNATURE----- _______________________________________________ Spacewalk-devel mailing list Spacewalk-devel@redhat.com https://www.redhat.com/mailman/listinfo/spacewalk-devel
