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

Re: Why can't commit attempt a merge automatically?

From: Stephen Webb <swebb_at_netlab.uky.edu>
Date: 2004-10-11 18:42:17 CEST

On Mon, 11 Oct 2004, Greg Goodrich wrote:

> Why is it that prior to each commit I need to do an update/merge
> process? I can understand the necessity if there are conflicts, but
> this seems like a bit of a pain if the changes that happened are not in

In addition to the "hasn't been tested" problem just mentioned, what
happens to your local copy? If the changes don't get merged in to your
local copy then you have a local copy (which you just committed) that
doesn't correspond to any version of the repository, and it just gets
messy from there (it seems). So if your local copy does get the merge,
then the commit operation just changed what is in your sandbox...which is
not what I expect.

I prefer keeping the update explicit.

-Steve

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Oct 11 19:43:49 2004

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.