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

RE: AW: Migrating from CVS - a couple of questions

From: Ciaran Treanor <ciaran.treanor_at_capetechnologies.com>
Date: 2004-08-11 19:27:52 CEST

> You *can* modify code as it's being committed, but doing so
> is *very,very* unwise, because the committer's working copy will now be
> out of sync with the actual commit contents, and this *will* cause
> that committer problems.

True. The problem I'm having is that developer1 checks code out. He doesn't
like the formatting and reformats it using his preferences, makes some
code changes and then commits his code.

Meanwhile, developer2 makes some changes to the same code and trys to
commits but gets a whole load of merge conflicts because developer1
changed the formatting and committed the file.

I'm trying to see if there are ways around this. Any ideas (other than
using a big stick!)?

ct

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Aug 11 19:28:15 2004

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