subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Apache subversion Wiki <comm...@subversion.apache.org>
Subject [Subversion Wiki] Update of "LocalMovesConflicts" by JulianFoad
Date Mon, 11 Feb 2013 23:18:23 GMT
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change notification.

The "LocalMovesConflicts" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/LocalMovesConflicts?action=diff&rev1=2&rev2=3

  === Incoming Delete F ===
  
  common-sense :=
-   follow -- that is, delete G (though this loses evidence that there was a local rename)
+   follow (though this loses evidence that there was a local rename)
  
- follow :=
+ follow | theirs :=
-   apply incoming delete to G as if 'G' were the explicit target (may raise a conflict, as
per standard rules for an incoming delete to a non-moved target)
+   apply the delete to G as if G were the explicit target (may raise a conflict, as per standard
rules for a non-moved target)
+ 
+ mine :=
+   re-schedule G as copied from old F
  
  === Incoming Move F to H ===
  
  common-sense :=
    conflict (neither G nor H is the obvious answer in all cases)
  
- follow | theirs-conflict :=
+ follow | theirs :=
-   move G to H (taking the incoming move target path to be relative to the parent of F)
+   move G to H; merge edits (taking the incoming path H as relative to the parent of F and
G)
+ 
+ mine :=
+   re-schedule H as moved to G; merge edits
  
  === Incoming Move F to G ===
  
- common-sense :=
+ common-sense | follow | theirs | mine :=
-   re-schedule G as non-moved; apply edits to G
+   re-schedule G as non-moved; merge edits
- 
- follow :=
-   no-op
  
  === Single Behaviour ===
  

Mime
View raw message