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 BenReser
Date Thu, 17 Jan 2013 19:44:14 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 BenReser:
http://wiki.apache.org/subversion/LocalMoves?action=diff&rev1=21&rev2=22

  === svn merge ===
  === svn move (on a moved node) ===
  === svn resolve (resolver) ===
+ Using theirs-conflict currently resolves a conflict from a local move by converting it to
a copy.  Is there a real use case for this?
- Using  theirs-conflict currently resolves a conflict from a local move by not  pulling in
their changes.  theirs-conflict should probably be removed as  an option since it doesn't
make any sense in this context.
- 
  Doesn't work after a merge with a local move?  Should it?
  
  === svn revert ===

Mime
View raw message