Luke Kanies wrote:
> On Mar 20, 2009, at 5:17 AM, Paul Nasrat wrote:
> 
>> 2009/3/20 Luke Kanies <[email protected]>:
>>> Things are actually in a broken state here because we've
>>> got a conflict between how the two sides do their work
>>> and some extraction needs to get done.  This commit
>>> is just a stopping-point so I can do the necessary
>>> refactoring.
>> Whilst it's good to capture history it might make code review easier
>> if things like this get folded/collapsed into the fixing commit.
> 
> Yeah, this was a mistake - I was pretty sure I'd had a commit like this,
> but I looked through the commit titles in rebase -i and couldn't spot  
> it,
> so I assumed I was wrong.  I obviously should have looked more deeply.
> 
> It's apparently already been merged, so now it's too late to fix.
> 

Did you not want it merged?  One shouldn't mark it "Ready for Checkin"
then. :)

James

-- 
Author of:
* Pulling Strings with Puppet
(http://www.amazon.com/gp/product/1590599780/)
* Pro Nagios 2.0
(http://www.amazon.com/gp/product/1590596099/)
* Hardening Linux
(http://www.amazon.com/gp/product/1590594444/)

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to