subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1161224 - /subversion/trunk/notes/moves
Date Wed, 24 Aug 2011 18:37:25 GMT
Author: stsp
Date: Wed Aug 24 18:37:25 2011
New Revision: 1161224

URL: http://svn.apache.org/viewvc?rev=1161224&view=rev
Log:
* notes/moves: Update to latest state of things.

Modified:
    subversion/trunk/notes/moves

Modified: subversion/trunk/notes/moves
URL: http://svn.apache.org/viewvc/subversion/trunk/notes/moves?rev=1161224&r1=1161223&r2=1161224&view=diff
==============================================================================
--- subversion/trunk/notes/moves (original)
+++ subversion/trunk/notes/moves Wed Aug 24 18:37:25 2011
@@ -118,13 +118,16 @@ Interfaces which have changed behaviour:
  - svn_client_patch: Patch uses move information to apply changes to files
      which have been moved locally.
 
-Interfaces which have not changed behaviour yet but will change in 1.8.0:
-
- - svn_client_update/svn_client_merge: Update and Merge will use move
+ - svn_client_update/svn_client_merge: Update and Merge use move
     information to auto-resolve the "local move vs. incoming edit"
     tree conflict scenario.
 
- - diff: Diff will use move information to generate 'rename from' headers
+Interfaces which have not changed behaviour yet but might change in 1.8.0:
+
+ - svn_client_update/svn_client_merge: Update and Merge might use move
+    information to auto-resolve some additional tree conflict scenario.
+
+ - diff: Diff might use move information to generate 'rename from' headers
     when the --git option is used. (A related problem is making diff use
     correct copyfrom in repos-repos diffs, which is not trivial.)
 



Mime
View raw message