On Tue, Sep 20, 2011 at 4:55 AM, Ken Barber <[email protected]> wrote: > Interesting approach. I'll be in portland for a week after puppetconf. > Happy to lend a hand. > > On Tue, Sep 20, 2011 at 2:48 AM, Luke Kanies <[email protected]> wrote: >> I agree. Maybe it's worth a merge-a-thon to get as many merged as possible >> in a fixed amount of time, then just draw the line? I think a merge-a-thon sounds like the best bet. We have quite a bit of outstanding code in topic branches, pulls, etc. Let's get it tested and put in, then switch the spacing.
Mike >> >> -- >> Luke Kanies | +1-615-594-8199 | http:/about.me/lak >> On Sep 19, 2011, at 3:22 PM, Adrien Thebo <[email protected]> wrote: >> >> I'm of two minds of this. On one hand, it would be terribly nice to get as >> many patches merged as possible before we do a whitespace change just so >> that we don't have to deal with any weird conflicts. On the other hand, as >> you said git can probably handle the whitespace change, and I would like to >> drive this change through as soon as possible. Since facter bugs do tend to >> sit for a while, I would like to get up the momentum to drive through the >> whitespace for 1.7.x before too much time passes. >> >> On Mon, Sep 19, 2011 at 6:36 AM, Ken Barber <[email protected]> wrote: >>> >>> Hi, >>> >>> So I raised a ticket for fixing mixed whitespace in facter: >>> >>> http://projects.puppetlabs.com/issues/9555 >>> >>> And I've got a preliminary patch in a topic branch just to see how bad >>> the problem is. The reason I've raised this is that people making >>> changes across multiple files at the moment are finding that some >>> files are 4 space indents, some are 2 space - and sometimes people are >>> mixing 2 space indents within 4 space indent files. >>> >>> I know we've done this before for Puppet - so I wouldn't mind getting >>> some opinion and ideas on this kind of a change. From an offline >>> discussion with Adrien Thebo we obviously want to make this easy for >>> any forward porting of patches from 1.6 to other branches. It was >>> suggested this kind of change wait for 1.7 which is cool - but if we >>> still are doing active development on 1.6 the forward porting maybe >>> become painful. Should we just do this across all active 'supported' >>> branches so we can feel the pain once and cherry-picked patches for >>> forward porting can then be more trivial? There is 15 pending merges >>> that would _potentially_ need to be fixed (and who knows how many that >>> haven't been requested yet that would need rebasing/fixing). >>> >>> Looking at the whitespace merge techniques around the net I can see >>> there is a recursive merge strategy option for ignoring whitespace >>> (-Xignore-space-change) but this seems to be in the wrong direction to >>> what we would desire. While rebase has an option to ignore whitespace >>> so at the very least this could be made easier for active development >>> work. >>> >>> What do people think about this? Does anyone have any experience with >>> feeling the pain of such a change? Is there a good strategy to adopt >>> here? I guess my attitude is that the sooner this is done the better, >>> but perhaps I'm being naive. >>> >>> ken. >>> >>> -- >>> "Join us for PuppetConf, September 22nd and 23rd in Portland, OR: >>> http://bit.ly/puppetconfsig"; >>> >>> -- >>> You received this message because you are subscribed to the Google Groups >>> "Puppet Developers" group. >>> To post to this group, send email to [email protected]. >>> To unsubscribe from this group, send email to >>> [email protected]. >>> For more options, visit this group at >>> http://groups.google.com/group/puppet-dev?hl=en. >>> >> >> >> >> -- >> Adrien Thebo >> [email protected] >> >> -- >> You received this message because you are subscribed to the Google Groups >> "Puppet Developers" group. >> To post to this group, send email to [email protected]. >> To unsubscribe from this group, send email to >> [email protected]. >> For more options, visit this group at >> http://groups.google.com/group/puppet-dev?hl=en. >> >> -- >> You received this message because you are subscribed to the Google Groups >> "Puppet Developers" group. >> To post to this group, send email to [email protected]. >> To unsubscribe from this group, send email to >> [email protected]. >> For more options, visit this group at >> http://groups.google.com/group/puppet-dev?hl=en. >> > > > > -- > "Join us for PuppetConf, September 22nd and 23rd in Portland, OR: > http://bit.ly/puppetconfsig"; > > -- > You received this message because you are subscribed to the Google Groups > "Puppet Developers" group. > To post to this group, send email to [email protected]. > To unsubscribe from this group, send email to > [email protected]. > For more options, visit this group at > http://groups.google.com/group/puppet-dev?hl=en. > > -- You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
