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

Re: How to disable automatic merging...

From: Talden <talden_at_gmail.com>
Date: 2007-12-11 02:28:24 CET

> > 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.

Once these committed changes are incorporated into your workspace, you
get complete autonomy in evaluating your changes in the context of
this current HEAD... You need to do this before committing your
changes.

This issue is not one merely of changes in the same file. Any other
file upon which your modifications depend could just as easily be
changed by another developer and 'merged' into your workspace during
an update. Committing your changes without evaluating that your
changes are compatible with the current HEAD would break the build.
So to resolve the concern you have, you don't just need to manually
review all of the change in files you personally have modified but
also any other changes being merged into your workspace.

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

As suggested, if you want more control, you can gain it by using the
mechanisms the tool is designed to support - use a branch. You can
then make commits on your own branch in safety without affecting
others and you choose when to pull in changes from trunk (and can
review their impact). It's easier to pass on your changes for review
as well.

--
Talden
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Dec 11 02:28:41 2007

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

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