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 "MultiLayerMoves" by PhilipMartin
Date Thu, 03 May 2012 15:52:31 GMT
Dear Wiki user,

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

The "MultiLayerMoves" page has been changed by PhilipMartin:
http://wiki.apache.org/subversion/MultiLayerMoves?action=diff&rev1=27&rev2=28

  
  Move A to X, a mixed-rev move:
  
- || op-depth || local-relpath || presence     || revision || moved-to ||
+ || op-depth || local-relpath || presence     || revision || moved-to || moved-here ||
- ||  0       ||    A          || normal       ||   1      ||          ||
+ ||  0       ||    A          || normal       ||   1      ||          ||            ||
- ||  0       ||    A/B        || normal       ||   2      ||          ||
+ ||  0       ||    A/B        || normal       ||   2      ||          ||            ||
- ||  0       ||    A/B/C      || normal       ||   3      ||          ||
+ ||  0       ||    A/B/C      || normal       ||   3      ||          ||            ||
- ||  1       ||    A          || base-deleted ||          ||   X      ||
+ ||  1       ||    A          || base-deleted ||          ||   X      ||            ||
- ||  1       ||    A/B        || base-deleted ||          ||          ||
+ ||  1       ||    A/B        || base-deleted ||          ||          ||            ||
- ||  1       ||    A/B/C      || base-deleted ||          ||          ||
+ ||  1       ||    A/B/C      || base-deleted ||          ||          ||            ||
- ||  1       ||    X          || normal       ||   1      ||          ||
+ ||  1       ||    X          || normal       ||   1      ||          ||      1     ||
- ||  1       ||    X/B        || not-present  ||          ||          ||
+ ||  1       ||    X/B        || not-present  ||          ||          ||            ||
- ||  2       ||    X/B        || normal       ||   2      ||          ||
+ ||  2       ||    X/B        || normal       ||   2      ||          ||      1     ||
- ||  2       ||    X/B/C      || not-present  ||          ||          ||
+ ||  2       ||    X/B/C      || not-present  ||          ||          ||            ||
- ||  3       ||    X/B/C      || normal       ||   3      ||          ||
+ ||  3       ||    X/B/C      || normal       ||   3      ||          ||      1     ||
- |||||||||| '''table H2''' ||
+ |||||||||||| '''table H2''' ||
  
  Nested moves inside X are now a problem. Consider moving X/B to X/Y:
  
- || op-depth || local-relpath || presence     || revision || moved-to ||
+ || op-depth || local-relpath || presence     || revision || moved-to || moved-here ||
- ||  0       ||    A          || normal       ||   1      ||          ||
+ ||  0       ||    A          || normal       ||   1      ||          ||            ||
- ||  0       ||    A/B        || normal       ||   2      ||          ||
+ ||  0       ||    A/B        || normal       ||   2      ||          ||            ||
- ||  0       ||    A/B/C      || normal       ||   3      ||          ||
+ ||  0       ||    A/B/C      || normal       ||   3      ||          ||            ||
- ||  1       ||    A          || base-deleted ||          ||   X      ||
+ ||  1       ||    A          || base-deleted ||          ||   X      ||            ||
- ||  1       ||    A/B        || base-deleted ||          ||          ||
+ ||  1       ||    A/B        || base-deleted ||          ||          ||            ||
- ||  1       ||    A/B/C      || base-deleted ||          ||          ||
+ ||  1       ||    A/B/C      || base-deleted ||          ||          ||            ||
- ||  1       ||    X          || normal       ||   1      ||          ||
+ ||  1       ||    X          || normal       ||   1      ||          ||     1      ||
- ||  1       ||    X/B        || not-present  ||          ||          ||
+ ||  1       ||    X/B        || not-present  ||          ||          ||            ||
- ||  2       ||    X/Y        || normal       ||   2      ||          ||
+ ||  2       ||    X/Y        || normal       ||   2      ||          ||            ||
- ||  2       ||    X/Y/C      || not-present  ||          ||          ||
+ ||  2       ||    X/Y/C      || not-present  ||          ||          ||            ||
- ||  3       ||    X/Y/C      || normal       ||   3      ||          ||
+ ||  3       ||    X/Y/C      || normal       ||   3      ||          ||            ||
- |||||||||| '''table H3''' ||
+ |||||||||||| '''table H3''' ||
  
  the op-depth=2 tree X/B gets removed and a new op-depth=2 tree X/Y is created.  There is
no base-deleted tree for X/B so the move to X/Y is not recorded.  Should the move to X/Y be
recorded and if so where?  Perhaps in the not-present node for X/B?
  

Mime
View raw message