[Cosmo-dev] Fwd: [commits-cosmo] (mde) [4291] Removing vast amounts of redundant whitespace.

Bobby Rullo br at osafoundation.org
Wed May 2 11:53:28 PDT 2007


I know your heart was in the right place, fighting the good-fight  
against spurious whitespace.

I'll try out that -x -w thing.

bobby
On May 1, 2007, at 5:56 PM, Matthew Eernisse wrote:

> Apologies, guys.
>
> I don't know if it helps, but version 1.4 of the SVN client allows  
> you to ignore whitespace in a diff/merge, so you can get your  
> changes in without a conflict (on Linux, 'svn merge -x -w'). Then  
> you can use rsync locally with --exclude '*svn*' or do a fresh pull  
> to get back on track.
>
> Again, sorry for throwing that monkey wrench into y'all's work.
>
>
> Matthew
>
>
> Bobby Rullo wrote:
>> Mde, Please don't do that again! It caused tons of conflicts for  
>> me and Travis.
>
> _______________________________________________
> cosmo-dev mailing list
> cosmo-dev at lists.osafoundation.org
> http://lists.osafoundation.org/mailman/listinfo/cosmo-dev



More information about the cosmo-dev mailing list