[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: <kfogel_at_collab.net>
Date: 2004-10-11 20:16:57 CEST

Greg Goodrich <ggoodrich@medinotes.com> writes:
> 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 conflict with each other. It seems to me that if I change a file,
> I should be able to just commit it, and then if someone else had snuck
> a change in "under" me, that subversion would quietly merge the files
> together, and assuming no conflict, go about its business. Maybe I am
> being naive about this whole process, and I could certainly understand
> a different/additional message about an automatic merge happening so
> that I'm aware of it.

Because that would mean that no human had ever seen the resulting file
before it appeared in the repository. No one would ever have had a
file with all the changes -- each person would just have their own
changes.

I think you can see why that might be a bad situation :-).

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Oct 11 22:06:01 2004

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