Ok, rather than running detab.sh before svn update, I suggest this
instead.
svn -q status | cut -c 8- | xargs -n 1 sed -i -e 's/\t//g'
It replaces tabs *only* in local files that you already have modified
versions of. The svn update therefore works normally on other files (no
Ok, as people seem happy to see tabs cleaned up done I'm doing it now.
But I'm leaving trailing whitespace alone for now; there is less benefit
and it does touch a whole lot of files.
To anyone who currently has checked-out directories with uncommitted
changes in them, I recommend running
By the way:
* the detab.sh script is here:
http://svn.apache.org/repos/asf/myfaces/myfaces-build-tools/trunk/other/scripts/detab.sh
* I haven't touched tobago, trinidad or portlet-bridge. It's up to the
developers of those projects to choose when/if they want to do this.
I also fixed quite a
Sorry, but I think conflicts are now being reported when updating a
checkout dir for files where *all* of these were true:
* contains tabs
* did not have eol-style set to native
* was not first checked in from your native platform.
I'll try to think of a nice way to automatically clean up those
SVN merge takes -x -w arguments to ignore whitespace. I am not sure
about updating.
-Andrew
On Thu, Jul 3, 2008 at 4:39 PM, simon [EMAIL PROTECTED] wrote:
Sorry, but I think conflicts are now being reported when updating a
checkout dir for files where *all* of these were true:
* contains tabs
Hi All,
In the new checkstyle rules file I enabled checks for tab characters, as
the myfaces convention is (AFAIK) to use 4 spaces, not tabs. However the
checkstyle report points out a lot of files containing tabs.
It's no big deal, but do we want to:
(a) disable the checkstyle rule and
Simon,
Do you have a number? How many files do have tab characters?
I think (b - fix them) would be the better solution. But only if that
does not change every second file.
--Manfred
On Wed, Jul 2, 2008 at 7:28 PM, [EMAIL PROTECTED]
[EMAIL PROTECTED] wrote:
Hi All,
In the new checkstyle rules
On Wed, Jul 2, 2008 at 7:28 PM, [EMAIL PROTECTED]
[EMAIL PROTECTED] wrote:
Hi All,
In the new checkstyle rules file I enabled checks for tab characters, as the
myfaces convention is (AFAIK) to use 4 spaces, not tabs. However the
checkstyle report points out a lot of files containing tabs.
Interesting question, Manfred. Here are the answers:
Count of java files is done via:
find . -name .svn -prune -o -name target -prune \
-o -name *.java -print | wc -l
Count of java files with tabs is done by running detab1.sh (which just
fixes tabs) then:
svn status | grep ^M | wc -l
+1 for b
Regards
Bernd
Matthias Wessendorf schrieb:
On Wed, Jul 2, 2008 at 7:28 PM, [EMAIL PROTECTED]
[EMAIL PROTECTED] wrote:
Hi All,
In the new checkstyle rules file I enabled checks for tab characters, as the
myfaces convention is (AFAIK) to use 4 spaces, not tabs. However the
10 matches
Mail list logo
