Re: [PATCH] Best Practices

Karl Fogel wrote:
> Scott Lamb <slamb@slamb.org> writes:
>
>>Then let's say I've checked out revision 62. At revision 65, someone
>>reindented. I've made changes to my working copy and want to commit
>>them without conflict. I could this with:
>>
>> $ svn up -r 64
>> $ svn up -r 65 --no-merge
>> $ indent -gnu src/*.[ch]
>> $ svn up
>
>
> Why not just run indent before you update to rev 65?

I've had bad luck before with merging not being smart enough to realize
a change has already been done, especially when I've had to adapt it a
bit. This would say so explicitly.

-- 
Scott Lamb
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org