subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1521759 - /subversion/branches/1.7.x/STATUS
Date Wed, 11 Sep 2013 08:51:58 GMT
Author: stsp
Date: Wed Sep 11 08:51:58 2013
New Revision: 1521759

URL: http://svn.apache.org/r1521759
Log:
* STATUS: Describe how to resolve merge conflict in r1306275 group.

Modified:
    subversion/branches/1.7.x/STATUS

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1521759&r1=1521758&r2=1521759&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Sep 11 08:51:58 2013
@@ -25,8 +25,9 @@ Candidate changes:
      http://svn.haxx.se/dev/archive-2012-03/0385.shtml), and it also breaks
      with the paradigm that the target of an editor drive may never have more
      than one path component (which according to cmpilato is an API violation).
-   Depends: conflicts on diff_tests.py
    Notes:
+     Conflict in diff_tests.py can be interactively resolved with:
+       (m) merge -> 21 (your version first, then theirs) -> r (resolved)
      Please read the branch and related trunk log messages for detailed notes
      about these changes.
    Branch:



Mime
View raw message