Re: [Python-Dev] Avoiding whitespace conflicts

2011-03-20 Thread Georg Brandl
On 20.03.2011 18:05, s...@pobox.com wrote: > > Ben> Ned Deily writes: > >> As a side note, if you are prone to accidentally adding extra > >> whitespace (like I am), you can add the whitespace check hook into > >> your local copy of Mercurial so that you will be warned about >

Re: [Python-Dev] Avoiding whitespace conflicts (was: I am now lost - committed, pulled, merged, what is "collapse"?)

2011-03-20 Thread skip
Ben> Ned Deily writes: >> As a side note, if you are prone to accidentally adding extra >> whitespace (like I am), you can add the whitespace check hook into >> your local copy of Mercurial so that you will be warned about >> whitespace problems immediately when you commit thi

[Python-Dev] Avoiding whitespace conflicts (was: I am now lost - committed, pulled, merged, what is "collapse"?)

2011-03-19 Thread Ben Finney
Ned Deily writes: > As a side note, if you are prone to accidentally adding extra > whitespace (like I am), you can add the whitespace check hook into > your local copy of Mercurial so that you will be warned about > whitespace problems immediately when you commit things to your local > repos rat