RE: Re: How to disable automatic merging...

> -----Original Message-----
> From: Talden [mailto:talden@gmail.com]
>
> > > 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
> >
> > Maybe I missed something fundamental about how to use SVN.
> If I work
> > on a project, then 'svn up' before committing, in case someone else
> > made changes at the same time, and I get a merged file, how
> do I see
> > what SVN changed for me in that file?
>
> You are somewhat obligated to accept incoming changes on your
> development path as they are committed changes already
> available to others.
======== snip =============

> Alternatively, accept updating as it stands and alter your
> pre-commit procedures.
>
> --
> Talden

Additionally, it is good practice to build unit tests as you build code.
The key front-line determinant of merge success is that all unit tests
execute successfully. The person who last committed will have verified
their work, and thus it is your turn when you have chages to commit.

I don't understand why Gus wants to make more work for himself, but if
that's what makes him comfortable, I guess it works for him.

Gus, if you're using a GUI environment, the checking of differences
between workspace and server is quite easy and visual. In Windows,
Tortoise makes this particularly easy. Use some kind of robust GUI if
you can.

--
David 
*************************************************************************
This communication, including attachments, is
for the exclusive use of addressee and may contain proprietary,
confidential and/or privileged information.  If you are not the intended
recipient, any use, copying, disclosure, dissemination or distribution is
strictly prohibited.  If you are not the intended recipient, please notify
the sender immediately by return e-mail, delete this communication and
destroy all copies.
*************************************************************************
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org