[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-issues
Subject:    [Issue 4426]  merge tool specified in config file isn't invoked
From:       breser () tigris ! org
Date:       2013-11-13 17:22:53
Message-ID: 20131113172253.26CD0540051 () sc157-tigr ! sjc ! collab ! net
[Download RAW message or body]

http://subversion.tigris.org/issues/show_bug.cgi?id=4426



User breser changed the following:

                What    |Old value                 |New value
================================================================================
                  Status|RESOLVED                  |REOPENED
--------------------------------------------------------------------------------
              Resolution|INVALID                   |
--------------------------------------------------------------------------------




------- Additional comments from breser@tigris.org Wed Nov 13 09:22:52 -0800 2013 -------
Reopening the issue per my discussion here.

The current implementation:

1) Provides no way to choose the internal merge tool.  This can be resolved by
adding another option that is always the internal merge tool, much like m is today.

2) Runs the internal merge tool after an error occurs when running the external
tool.  Which doesn't seem to be correct to me.

With respect to a 1.8.x backport, I'm not sure this is appropriate since
changing the behavior of m may be surprising to some users, however I'm not sure
that I'm -1 on the backport if the above issues are fixed.

See also my email to the dev list to this effect:
https://mail-archives.apache.org/mod_mbox/subversion-dev/201311.mbox/%3C5282FE15.40505%40reser.org%3E

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=463&dsMessageId=3068409

To unsubscribe from this discussion, e-mail: [issues-unsubscribe@subversion.tigris.org].
[prev in list] [next in list] [prev in thread] [next in thread]