You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2014/04/17 09:46:29 UTC
svn commit: r1588147 - in /subversion/branches/1.8.x: ./ STATUS
subversion/svn/conflict-callbacks.c
Author: svn-role
Date: Thu Apr 17 07:46:29 2014
New Revision: 1588147
URL: http://svn.apache.org/r1588147
Log:
Merge r1577294 from trunk:
* r1577294
Make interactive conflict resolver behave as designed.
Justification:
This was intended to be the behavior form the start. A typo in a
refactoring broke it. This fix helps users avoid accidentally choosing
'mark resolved' and committing conflict markers.
Votes:
+1: breser, ivan, julianfoad
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/svn/conflict-callbacks.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1577294
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1588147&r1=1588146&r2=1588147&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Thu Apr 17 07:46:29 2014
@@ -348,16 +348,6 @@ Approved changes:
Votes:
+1: rhuijben, ivan, julianfoad
- * r1570642, r1585686, r1586352
- Fix memcached support.
- Justification:
- Enabling memcached causes crashes without these fixes.
- Regression from 1.7.
- Notes:
- Merge with --accept=working to resolve FSX conflict.
- Votes:
- +1: stsp, philip, julianfoad
-
* r1578670, r1578820, r1579274, r1587511
Fix the order of node record headers written by svndumpfilter.
Justification:
Modified: subversion/branches/1.8.x/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/svn/conflict-callbacks.c?rev=1588147&r1=1588146&r2=1588147&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/svn/conflict-callbacks.c (original)
+++ subversion/branches/1.8.x/subversion/svn/conflict-callbacks.c Thu Apr 17 07:46:29 2014
@@ -935,7 +935,7 @@ handle_text_conflict(svn_wc_conflict_res
/* We only allow the user accept the merged version of
the file if they've edited it, or at least looked at
the diff. */
- if (result->choice == svn_wc_conflict_choose_merged
+ if (opt->choice == svn_wc_conflict_choose_merged
&& ! knows_something)
{
SVN_ERR(svn_cmdline_fprintf(