[Pki-devel] git push

[Nathan Kinder]

On 01/23/2012 06:58 PM, Adam Young wrote:
> On 01/19/2012 04:12 PM, Nathan Kinder wrote:
>> I don't think that this is correct.  There is functionality and 
>> critical bug fixing going on in the Dogtag 9 branch that we 
>> definitely want to get into master.  It needs to get there somehow.  
>> Of course there may be work that is not needed on master due to 
>> refactoring, but that needs to be determined on a patch-by-patch basis.
>>
>> If the concern is changes causing rebase headaches for Endi and Ade, 
>> then we could use a gatekeeper approach, but I haven't seen the need 
>> for that.
>>
>> -NGK
> You've probably cleared this up, but:  I think that chagnes going on 
> in 9  are going to need formatting aligned with the Master branch 
> before they can be pushed.  Ade had suggested that the approach would 
> involve formatting in the 9 series before pushing changes,  but I am 
> not sure if this is going to work across the board any way.  I assume 
> that fixes going into the 9 series wil lbe small enough patches that 
> they can be had merged into  master.
Yes, we are just hand merging this stuff.  We have not been reformatting 
on the 9 branch, and will avoid doing so.
>
> _______________________________________________
> Pki-devel mailing list
> Pki-devel at redhat.com
> https://www.redhat.com/mailman/listinfo/pki-devel