Author: stsp
Date: Mon Jul 25 15:54:54 2011
New Revision: 1150760

URL: http://svn.apache.org/viewvc?rev=1150760&view=rev
Log:
On the gpg-agent-password-store branch, remerge (that is, reverse-merge
and then merge again) r1146165, r1146496, r1146501. For some reason the
right set of changes was not merge into this branch when these revisions
were originally merged.

Added:
    subversion/branches/gpg-agent-password-store/notes/moves
      - copied, changed from r1146165, subversion/trunk/notes/moves

Copied: subversion/branches/gpg-agent-password-store/notes/moves (from 
r1146165, subversion/trunk/notes/moves)
URL: 
http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/notes/moves?p2=subversion/branches/gpg-agent-password-store/notes/moves&p1=subversion/trunk/notes/moves&r1=1146165&r2=1150760&rev=1150760&view=diff
==============================================================================
--- subversion/trunk/notes/moves (original)
+++ subversion/branches/gpg-agent-password-store/notes/moves Mon Jul 25 
15:54:54 2011
@@ -66,6 +66,11 @@ Some existing interfaces will be extende
 and _scan_deletion() interfaces will be extended to differentiate
 moved nodes from copied, added, and deleted nodes.
 
+### gstein: note that scan_addition() already returns status_moved_here,
+###   and scan_deletion() returns a MOVED_TO_ABSPATH. these functions
+###   should already do what you're asking (with bitrot and "untested"
+###   caveats since I first implemented them).
+
 There might be some public API changes (TBD).
 
 We might require a working copy upgrade when going from 1.7 to 1.8,
@@ -101,6 +106,11 @@ Some code that is expected to change beh
  - update/merge: Update and Merge will 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
+    when the --git option is used.
+
+ - patch: Patch will use move information to apply changes to files
+    which have been moved locally.
 
 Several public APIs may be bumped as their behaviour changes.
 For backwards compatibility, APIs released prior to 1.8 will continue


Reply via email to