[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] Best Practices

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2002-08-08 19:44:36 CEST

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?

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Aug 8 20:00:34 2002

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.