Issue #9555 has been updated by Ken Barber.
Branch set to kbarber/facter/ticket/9555-fix_whitespace
I get the feeling whitespace changes aren't as straight-forward as I thought
with git.
There is a merge strategy option '-X ignore-all-spaces' but it effectively
means your overwriting your local space changes as apposed to the changes we
are pulling in - ie. its the wrong direction.
When people rebase at least, they can use:
git rebase --ignore-whitespace master
And it will allow them to manually go and fix changes on the rebase. This is
something.
I think largely when you try to merge changes with whitespace mismatch we're
going to get conflicts that need to be resolved. Its a pain basically. The
biggest pain would be forward porting changes on the 1.6.x branch to 1.7.
Anyway - I've got a patch in a topic branch so we can see how bad the change is.
----------------------------------------
Bug #9555: Whitespace in code
https://projects.puppetlabs.com/issues/9555
Author: Ken Barber
Status: Unreviewed
Priority: Low
Assignee:
Category:
Target version: 1.7.0
Keywords:
Branch: kbarber/facter/ticket/9555-fix_whitespace
Affected Facter version: 1.6.1rc3
So there is some mismatched whitespace throughout the facter code due to an
older 4 space convention I believe. This ticket is to cover that fix. It
doesn't affect every file - just some of the core ones I believe. Anyway -
someone will have to go through the files and fix this.
I figured its better to fix this sooner rather then later :-).
--
You have received this notification because you have either subscribed to it,
or are involved in it.
To change your notification preferences, please click here:
http://projects.puppetlabs.com/my/account
--
You received this message because you are subscribed to the Google Groups
"Puppet Bugs" 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-bugs?hl=en.
