#48 http://svnbook.red-bean.com/nightly/en/svn.tour.treeconflicts.html lacks info on directory collisions

[Anonymous]

Originally created by: bimargul...@gmail.com
Originally owned by: cmpilato

With 1.6.1, I find that refactoring in Eclipse leads to a situation where
the working directory is out of data, even when eclipse was using that
directory.

When this happens, it's very easy to get trapped in
D     C lucene2.2/src/main/resources/com/basistech/internal/etrog
      >   local delete, incoming edit upon update
D     
lucene2.2/src/main/resources/com/basistech/internal/etrog/bl1-config.xml

The recipe at the URL above does not cure this problem.

[Anonymous]

Originally posted by: s...@elego.de

The book will never be able to provide recipes for all possible tree conflicts.
There are many possible tree conflicts, each with at least two or more possible
resolutions. Describing them all is a lot of work and would blow the tree conflict
section of the book way out of proportion.

I agree that the book could provide a few more examples than it current does, though.
Subclipse and TortoiseSVN provide a good set of possible use cases to chose examples
from.

However, in general, if you have a problem resolving a tree conflict,
please ask on the users mailing list first. Thank you.

[Anonymous]

Originally posted by: cmpilato

bimargulies, are you reporting a bug in the documentation, or a problem with
Subversion (or both)?

[Anonymous]

Originally posted by: cmpilato

(No comment was entered for this change.)

Owner: cmpilato

[Anonymous]

Originally posted by: cmpilato

Closing as invalid due to a lack of response by the original poster to questioned posed.  bimargulies, feel free to reopen this later if/when you can help us better understand your concern.

Status: Invalid