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

List:       subversion-issues
Subject:    [Issue 4238]  merge -cA,B with --accept option aborts if rA conflicts
From:       julianfoad () tigris ! org
Date:       2013-01-29 22:56:33
Message-ID: 20130129225634.52DCF54005B () sc157-tigr ! sjc ! collab ! net
[Download RAW message or body]

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



User julianfoad changed the following:

                What    |Old value                 |New value
================================================================================
                  Status|STARTED                   |RESOLVED
--------------------------------------------------------------------------------
              Resolution|                          |FIXED
--------------------------------------------------------------------------------




------- Additional comments from julianfoad@tigris.org Tue Jan 29 14:56:32 -0800 2013 \
------- Fixed in r1440193.

See the dev@ email thread "[RFC] Run the conflict resolver callback per file
during merge - issue #4238" started by me on 2013-01-24, at e.g.
<http://svn.haxx.se/dev/archive-2013-01/0464.shtml> or
<http://mail-archives.apache.org/mod_mbox/subversion-dev/201301.mbox/%3C1359065776.93274.YahooMailNeo%40web186103.mail.ir2.yahoo.com%3E>.


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

To unsubscribe from this discussion, e-mail: \
[issues-unsubscribe@subversion.tigris.org].


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