Login | Register
My pages Projects Community openCollabNet

Discussions > dev [DISABLED] > Re: [PATCH] Allow the merge tool to abort the merge

subversion
Discussion topic

Back to topic list

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

Author jszakmeister
Full name John Szakmeister
Date 2009-01-03 09:31:30 PST
Message On Fri, Jan 2, 2009 at 11:23 AM, Augie Fackler <durin42 at gmail dot 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

« Previous message in topic | 19 of 22 | Next message in topic »

Messages

Show all messages in topic

[PATCH] Allow the merge tool to abort the merge jgmyers John Gardiner Myers 2008-12-23 17:24:35 PST
     Re: [PATCH] Allow the merge tool to abort the merge jgmyers John Gardiner Myers 2008-12-24 16:03:19 PST
         Re: [PATCH] Allow the merge tool to abort the merge stsp Stefan Sperling 2008-12-25 05:03:23 PST
             Re: [PATCH] Allow the merge tool to abort the merge jgmyers John Gardiner Myers 2008-12-29 12:19:01 PST
                 Re: [PATCH] Allow the merge tool to abort the merge stsp Stefan Sperling 2008-12-29 17:22:51 PST
                     Re: [PATCH] Allow the merge tool to abort the merge jgmyers John Gardiner Myers 2008-12-29 21:54:50 PST
                         Re: [PATCH] Allow the merge tool to abort the merge stsp Stefan Sperling 2008-12-30 01:55:03 PST
                             Re: [PATCH] Allow the merge tool to abort the merge jgmyers John Gardiner Myers 2008-12-30 10:22:15 PST
                                 Re: [PATCH] Allow the merge tool to abort the merge stsp Stefan Sperling 2008-12-30 18:50:10 PST
                                     Re: [PATCH] Allow the merge tool to abort the merge durin42 Augie Fackler 2008-12-31 07:18:21 PST
                                         Re: [PATCH] Allow the merge tool to abort the merge jgmyers John Gardiner Myers 2008-12-31 08:38:05 PST
                                             Re: [PATCH] Allow the merge tool to abort the merge durin42 Augie Fackler 2008-12-31 08:40:18 PST
                                                 Re: [PATCH] Allow the merge tool to abort the merge jgmyers John Gardiner Myers 2008-12-31 09:15:26 PST
                                                     Re: [PATCH] Allow the merge tool to abort the merge durin42 Augie Fackler 2009-01-01 19:44:40 PST
                                                         Re: [PATCH] Allow the merge tool to abort the merge stsp Stefan Sperling 2009-01-02 02:38:25 PST
                                                             Re: [PATCH] Allow the merge tool to abort the merge jszakmeister John Szakmeister 2009-01-02 03:54:01 PST
                                                                 Re: [PATCH] Allow the merge tool to abort the merge durin42 Augie Fackler 2009-01-02 08:24:02 PST
                                                                     Re: [PATCH] Allow the merge tool to abort the merge jgmyers John Gardiner Myers 2009-01-02 09:12:53 PST
                                                                     Re: [PATCH] Allow the merge tool to abort the merge jszakmeister John Szakmeister 2009-01-03 09:31:30 PST
                                     Re: [PATCH] Allow the merge tool to abort the merge stsp Stefan Sperling 2009-02-25 05:48:58 PST
                                         Re: [PATCH] Allow the merge tool to abort the merge stsp Stefan Sperling 2009-02-25 07:33:22 PST
                                             Re: [PATCH] Allow the merge tool to abort the merge stsp Stefan Sperling 2009-02-27 05:17:21 PST
Messages per page: