[cgma-dev] r3402 - cgm/trunk/itaps
Jason Kraftcheck
kraftche at cae.wisc.edu
Mon Dec 7 10:06:43 CST 2009
James Porter wrote:
>> If you must clean up white space and line wrapping and such, it would
>> be helpful if you would keep such checkins separate from changes to
>> documentation content or code functionality. For example, all of your
>> changes in this checkin will likely be lost unless we push these
>> changes to the upstream RPI repository. If someone were inclined to
>> review the changes you made before doing so, they will be hindered by
>> the 4000 lines of whitespace changes in this checkin.
>
> Er, sorry about that. If you prefer, I could extract the actual content
> changes and package that up into a diff for application elsewhere.
>
It isn't that big of a deal. I can always use diff -b to discard whitespace
changes. But in the future it would be helpful if you were to keep large
amounts of whitespace changes as a separate checkin, both for this reason
and for dealing with possible merging conflicts.
thanks,
- jason
More information about the cgma-dev
mailing list