You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by Apache subversion Wiki <co...@subversion.apache.org> on 2013/09/05 12:17:15 UTC
[Subversion Wiki] Trivial Update of "MoveDev/MoveTrackingUpdateEditor" by JulianFoad
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=2&rev2=3
Comment:
Tweak a rev num for clarity in an example.
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)
- * Update to r30; A moves to B, and also the existing B is updated.
+ * Update to r20; A moves to B, and also the existing B is updated.
{{{
| |
@@ -76, +76 @@
With a many-to-many move, there is the possibility that the sources and destinations can be logically paired according to their path-wise nearness. Example, starting from WC (trunk1→^/trunk@10, trunk2→^/trunk@20) and repo (mv trunk/A@10 → trunk/B@20):
{{{
- | |
+ | |
+-- trunk1 +-- trunk1
| | | |
| +-- A mv--\ | |