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 "LocalMoves" by JulianFoad
Date Wed, 16 Jan 2013 18:27:42 GMT
Dear Wiki user,

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

The "LocalMoves" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/LocalMoves?action=diff&rev1=7&rev2=8

  
  Well, not yet a design but just a collection of notes.
  
+ ----
+ /!\ '''Edit conflict - other version:'''
+ 
+ ----
+ 
+ ----
+ /!\ '''Edit conflict - your version:'''
+ 
+ ----
+ == To Break or Not To Break? ==
+ One of the main UI (and high-level API) changes is that many operations on the path representing
one half the move should be aware of the other half and perhaps require that both halves are
acted on together: for example, an attempt to commit one half of a move without the other
should error out.  Brief thoughts:
+ 
+ commit should require both together
+ 
+ delete should change the 'from' path to deleted
+ 
+ revert should require both together (and require recursive if either half has children)
+ 
+ ...
+ 
+ ----
+ /!\ '''End of edit conflict'''
+ 
+ ----
  === svn status ===
  Currently shows 'D' for every node in the moved-away tree, but 'A+' only for the root of
the moved-here.  A minimum change is: show just 'D' for only the root node of the moved-away
subtree (and still one 'A+' for the moved-here).
  
@@ -23, +47 @@

  Should it require 'force' for that?
  
  === svn resolve (resolver) ===
- 
  Using theirs-commit currently resolves a conflict from a local move by not pulling in their
changes.  theirs-commit should probably be removed as an option since it doesn't make any
sense in this context.
  

Mime
View raw message