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 Tue, 12 Feb 2013 18:45:03 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=4&rev2=5

   . re-schedule G as copied from old F
  
  === Incoming Move F to H ===
+ Neither G nor H is the obvious final destination in all cases.  In all cases, it makes sense
to merge the edits (but we might need to defer that until the final destination is chosen).
+ 
  common-sense :=
  
-  . conflict (neither G nor H is the obvious answer in all cases)
+  . tree-conflict
  
  follow | theirs :=
  
@@ -58, +60 @@

   . re-schedule G as non-moved; merge edits
  
  === Single Behaviour ===
+ These scenarios are all genuine tree conflicts (meaning there is no single "obvious" intention
as there is with an "edit onto moved" scenario), and typically infrequent, so raising a conflict
by default is satisfactory.
+ 
+ common-sense :=
+ 
+  tree-conflict
+ 
+ follow :=
+ 
+  ??
+ 
+ theirs :=
+ 
+  ??
+ 
+ mine :=
+ 
+  ??
+ 
  == Incoming Delete Parent, Local Moved-Away Child ==
  == Incoming Delete Child, Local Moved-Away Parent ==
  

Mime
View raw message