Re: How to disable automatic merging...

> > This has always been one of my pet peeves CVS and it annoyed me that it was
> > carried over into SVN. Why isn't automatic merging an OPTION? A "mostly
> > works" solution isn't great for every team or type of repository.
>
> Exactly. Turn it *on* if you want it. Even though it sounds like I'm
> definitely in the minority on auto-merging, I maintain what I said in
> my original posting. Auto-merge is writing code for you. If you trust
> it, great (I hope you're right). But if you don't, like me, then you
> want to see the changes before committing your own.

Which of course you do...

If File X.java exists in the repo for which both Dev A and Dev B have
working copies and the following occurs.

  Dev A modifies X.java, reviews the changes and commits
  Dev B modifies X.java, updates (getting a merge), reviews the
changes and commits

Then you have no problem... Everyone gets to see that what they have
in the way of changes is sensible before they commit.

Reviewing changes for a software development project would generally
involve building the code and, depending upon your testing
infrastructure, running the unit-tests. You only need to build and
test the areas that touch files in which you have local modifications
so this isn't an unreasonable expectation.

Unless you're hasty on the commit button, this is going to discover
the vast majority of situations where auto-merging might not have done
what you expected.

Files that don't merge well should probably require locks.

IMHO if you have problems with developers stepping on each other in
this manner regularly then you have project organisational issues to
deal with first and foremost.

--
Talden
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org