Per Inge Mathisen schreef:
On Tue, Jun 17, 2008 at 3:18 PM, Dennis Schridde <[EMAIL PROTECTED]> wrote:Am Dienstag, 17. Juni 2008 09:02:13 schrieb Per Inge Mathisen:On Tue, Jun 17, 2008 at 12:35 AM, Dennis Schridde <[EMAIL PROTECTED]> wrote:Principle, yes. I am also against commits like "change style in a.c, b.c, ..., z.c and add a tiny feature in k.c". For me the seperation starts to become overkill when it goes like "change style foo(), ..., bar()", "add feature to foo() which affects ..., bar()". I am already trying to seperate it a bit, but if I would be asked to touch every block twice, once for cleanup and once for changes, to get the patch out of the tracker and into the repositoryIt is not that difficult. svn diff > mypatch cp mypath mycleanup nano mycleanup (delete all real changes from patch) svn revert -R . patch -p0 < mycleanup svn commit I do this all the time. Or the other way around. I have a separate "clean" tree I use only for committing smaller pieces of patches, to get them down to minimum size before storing them for later and/or committing them for real.
Or for those who use VIM:Select the lines that need indentation (capital 'V' to go into "visual" mode for selecting full lines, then use your arrow keys to select lines of choice). Then simply press '='. If you're indentation settings are correct (which they'll most likely be, as VIM's default indentation settings match warzone's indentation style), then the lines are now properly indented.
By doing this process both in the patch and on a "fresh" working copy you'll prevent real conflicts (Subversion might still consider it a conflict).
-- Giel
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Warzone-dev mailing list [email protected] https://mail.gna.org/listinfo/warzone-dev
