On 06/12/2013 12:28 AM, Julian Foad wrote: >>> > FYI, this is what the new output looks like: >>> > >>> > $ svn up -r3 >>> > Updating '.': >>> > C alpha >>> > At revision 3. >>> > Summary of conflicts: >>> > Tree conflicts: 1 >>> > Tree conflict on 'alpha' >>> > > local file moved away, incoming file edit upon update >>> > Select: (mc) apply edit (recommended), (r) discard edit (breaks move), >>> >>> Why does discarding the incoming edit break the (local) move?
[...] >> The copy/add part would be of a different revision than the delete part of >> the move if you don't apply the move. > > That doesn't make any sense to me as a user. "Discard edit" sounds like > it means "act as if the incoming edit was a no-op"... and I would not expect a > no-op to break the local move. I'm gotta say, I'm wondering about this, too. -- C. Michael Pilato <cmpil...@collab.net> CollabNet <> www.collab.net <> Enterprise Cloud Development
signature.asc
Description: OpenPGP digital signature
