[prev in list] [next in list] [prev in thread] [next in thread] 

List:       spacewalk-devel
Subject:    [Spacewalk-devel] building packages in remote branch
From:       mmccune () redhat ! com (Mike McCune)
Date:       2009-01-21 17:24:23
Message-ID: 49775A47.5080109 () redhat ! com
[Download RAW message or body]

Miroslav Such? 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.
> 

ah, right!  Forgot about the need to bump up the major rev in master 
once we branch for a release.

> 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.
> 

yup, like dgoodwin ran into :)

Thanks ..
Mike
-- 
Mike McCune
mmccune AT redhat.com
Engineering               | Portland, OR
RHN Satellite             | 650.567.9039x79248


[prev in list] [next in list] [prev in thread] [next in thread]