[katello-devel] KATELLO-1.3 branched

[Justin Sherrill]

On 04/15/2013 11:07 AM, Petr Chalupa wrote:
>
>
> On 13.04.13 1:26, Justin Sherrill wrote:
>> Hi All,
>>
>> Katello 1.3 has been branched.  All packages have had there versions
>> bumped to 1.4 and have been tagged in master.  Koji tags has been cloned
>> to there 1.3 clones.
>>
>> I will announce when we have repos for testing early next week.  In the
>> meantime if you discover an issue in master or have a PR that you want
>> to be cherry-picked to KATELLO-1.3, simply open an issue and tag it with
>> Katello 1.3.  This will ensure that I will include it in the 1.3 
>> release.
>
> Couldn't we just fix those issues in KATELLO-1.3 branch and then merge 
> it back to master instead of cherry-picking? I think that would be 
> more natural, see [1].
>
> [1] http://nvie.com/posts/a-successful-git-branching-model/

Ideally.  Although there are changes made in the 1.3 branch which we 
don't want in master, such as updates to releases.conf, tito.props,  the 
repo files in ./repos/  and any spec changes/version bumps.

-Justin

>
>>
>> Also thanks to all the help from everybody to help get master in a state
>> that it could be branched! THANK YOU!
>>
>> -Justin
>>
>> _______________________________________________
>> katello-devel mailing list
>> katello-devel at redhat.com
>> https://www.redhat.com/mailman/listinfo/katello-devel
>
> _______________________________________________
> katello-devel mailing list
> katello-devel at redhat.com
> https://www.redhat.com/mailman/listinfo/katello-devel