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

Re: [PATCH] Allow the merge tool to abort the merge

From: John Szakmeister <john_at_szakmeister.net>
Date: Sat, 3 Jan 2009 12:31:27 -0500

On Fri, Jan 2, 2009 at 11:23 AM, Augie Fackler <durin42_at_gmail.com> wrote:
[snip]
> Fair enough - it's clear I don't understand something here the same as
> everyone else, so I'm going to beat this horse one more time to try and
> figure out where I'm wrong. When the merge runs, it ends up in the WC, so if
> the merge tool exited nonzero, we know there will be a 'C' status in svn st
> output. Why is it *necessary* for the svn tool to abort to achieve what John
> wants to do? Wouldn't svn st | egrep '^C' give similar information?

Keep beating away, if it helps. :-) In most cases, I don't think
there is any difference. But, what happens if the tool is trying to
do something smart, and crashes, or runs out of disk space, or out of
memory, etc.? Perhaps at that point we haven't had an opportunity to
mark the conflicts in the working copy file, so it would seem wrong to
mark it as such. Also, one failure will likely need to another. So
it's probably best to just stop in that case. That's at least my
reasoning anyways. I personally don't care much... I just wanted to
show that there is precedent that we did follow elsewhere in the code
base.

Hope that helps!

-John

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1000757
Received on 2009-01-03 18:31:50 CET

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