subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1501059 - in /subversion/branches/1.8.x: ./ STATUS subversion/svn/file-merge.c
Date Tue, 09 Jul 2013 04:00:07 GMT
Author: svn-role
Date: Tue Jul  9 04:00:06 2013
New Revision: 1501059

URL: http://svn.apache.org/r1501059
Log:
Merge the r1491816 group from trunk:

 * r1491816, r1494089
   Add two additional options to interactive file merge.
   Justification:
     Usability enhancement for quicker conflict resolution in some cases.
     Very simple change. Only affects interactive mode, not scripts.
   Votes:
     +1: stsp, danielsh, stefan2

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/subversion/svn/file-merge.c

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1491816,1494089

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1501059&r1=1501058&r2=1501059&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Jul  9 04:00:06 2013
@@ -120,14 +120,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1491816, r1494089
-   Add two additional options to interactive file merge.
-   Justification:
-     Usability enhancement for quicker conflict resolution in some cases.
-     Very simple change. Only affects interactive mode, not scripts.
-   Votes:
-     +1: stsp, danielsh, stefan2
-
  * r1500680
    Use local style for paths in error messages for 'svn diff --old A --new B'
    Justification:

Modified: subversion/branches/1.8.x/subversion/svn/file-merge.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/svn/file-merge.c?rev=1501059&r1=1501058&r2=1501059&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/svn/file-merge.c (original)
+++ subversion/branches/1.8.x/subversion/svn/file-merge.c Tue Jul  9 04:00:06 2013
@@ -655,6 +655,8 @@ merge_chunks(apr_array_header_t **merged
   svn_stringbuf_appendcstr(
     prompt,
     _("Select: (1) use their version, (2) use your version,\n"
+      "        (12) their version first, then yours,\n"
+      "        (21) your version first, then theirs,\n"
       "        (e1) edit their version and use the result,\n"
       "        (e2) edit your version and use the result,\n"
       "        (eb) edit both versions and use the result,\n"
@@ -679,6 +681,24 @@ merge_chunks(apr_array_header_t **merged
           *merged_chunk = chunk2;
           break;
         }
+      if (strcmp(answer, "12") == 0)
+        {
+          *merged_chunk = apr_array_make(result_pool,
+                                         chunk1->nelts + chunk2->nelts,
+                                         sizeof(svn_stringbuf_t *));
+          apr_array_cat(*merged_chunk, chunk1);
+          apr_array_cat(*merged_chunk, chunk2);
+          break;
+        }
+      if (strcmp(answer, "21") == 0)
+        {
+          *merged_chunk = apr_array_make(result_pool,
+                                         chunk1->nelts + chunk2->nelts,
+                                         sizeof(svn_stringbuf_t *));
+          apr_array_cat(*merged_chunk, chunk2);
+          apr_array_cat(*merged_chunk, chunk1);
+          break;
+        }
       else if (strcmp(answer, "p") == 0)
         {
           *merged_chunk = NULL;



Mime
View raw message