Subversion update behavior during tree conflict resolution

Working Copy Synchronization and Tree Conflicts

The svn update command is designed to synchronize a local working copy with the repository HEAD revision. While text conflicts are handled via the generation of .mine and .rNEW files, tree conflicts occur when the structure of the directory tree changes in a way that contradicts local modifications, such as a file being deleted on the server but modified locally.

There is uncertainty regarding the state of the working copy metadata when svn revert is applied to a file currently marked with a tree conflict (C) versus a standard text conflict. Specifically, the interaction between the revert command and the internal conflict markers can vary depending on whether the conflict is structural or content-based.

• How does svn revert impact the resolution state of a tree conflict compared to a text conflict?
• Does reverting a tree-conflicted file automatically clear the conflict flag without requiring svn resolve?