[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: Greg Goodrich <ggoodrich_at_medinotes.com>
Date: 2004-10-11 21:02:22 CEST

Stephen Webb wrote:

>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
>
>
I wasn't suggesting that the sandbox copy not receive the merged
changes. I think it should. How could you keep your sandbox from
getting the changes if you desired to commit your changes? Like I said,
maybe it should inform of the merge. Maybe it should just be a setting
that can determine how to deal with the situation? That way, people
that like the way it works currently can have that, but others, such as
myself, can allow the tool to help them out. I think 99% of the time
what is going to take place is that the person will run svn merge, it
will succeed, and then the person will commit the changes. Why not have
a way to have this happen automatically?

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

-- 
*Greg Goodrich*
Development Manager
*MediNotes Corporation*
1025 Ashworth Road, Suite 222
West Des Moines, IA 50265
Phone: 515.327.8850 ext. 251/
/Fax: 515.327.8856
	
<http://www.medinotes.com>
*Charting Plus - "The Best EMR Value on the Market!"
**www.medinotes.com* <http://www.medinotes.com/>
 
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Oct 11 21:03:10 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.