Dear Wiki user,

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

The "ResolvingIncomingMoves" page has been changed by StefanSperling:
https://wiki.apache.org/subversion/ResolvingIncomingMoves?action=diff&rev1=1&rev2=2

Comment:
fix formatting errors

  B/n (local add vs incoming add) and B/d (local move vs incoming deletion)
  in the ACTUAL_NODE table. This raises several new problems:
  
- * The meaning of the terms 'local' and 'incoming' in conflict descriptions
+ The meaning of the terms 'local' and 'incoming' in conflict descriptions
-   is now misleading because both of the conflicting tree changes were made
+ is now misleading because both of the conflicting tree changes were made
-   in the working copy ('local').
+ in the working copy ('local').
  
- * The resolver will have to be taught to resolve such conflicts (this is
+ The resolver will have to be taught to resolve such conflicts (this is
-   not impossible but implies extra implementation effort).
+ not impossible but implies extra implementation effort).
  
- * The resolver will have to choose whether the existing node in B should
+ The resolver will have to choose whether the existing node in B should
-   be left as-is, or whether it should be replaced with the node from A.
+ be left as-is, or whether it should be replaced with the node from A.
-   Either way, information is lost unless the rows for conflicting nodes
+ Either way, information is lost unless the rows for conflicting nodes
-   are left unmodified in both A and B.
+ are left unmodified in both A and B.
  
  The resolver could also reject conflict resolution if local changes are
  present in the B tree. However, this approach would work only for updates

Reply via email to