[Subversion Wiki] Update of "MoveDev/MoveTrackingUpdateEditor" by JulianFoad

[Apache subversion Wiki <co...@subversion.apache.org>]

Dear Wiki user,

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

The "MoveDev/MoveTrackingUpdateEditor" page has been changed by JulianFoad:
https://wiki.apache.org/subversion/MoveDev/MoveTrackingUpdateEditor?action=diff&rev1=3&rev2=4

Comment:
Correct the previous tweak to an example.

  === One Move, One Non-Move ===
  This case is similar to Multiple Sources, with one important difference.  If we assume an editor in which each move is labelled by a move-id, the consumer cannot recognize such a conflict just by examining the move-ids.
  
-  * WC: (A@10, B@20); repo: (mv A@10 → B@20)
+  * WC: (A@10, B@20); repo: (r10: mkdir A; r20: mv A B; edit B; r30: edit B)
-  * Update to r20; A moves to B, and also the existing B is      updated.
+  * Update to r30; A moves to B (with edits), and also the existing B is      updated.
+  * These changes conflict. A typical resolution would be to merge them: put both sets of local mods into the same B.
  
  {{{
  |                   |