Re: [TSVN] TortoiseSVN does not let you resolve conflicted directories

Butt Dyno wrote:

> Maybe I'm misunderstanding you, but I think that only works for files.
> We didn't see any additional files (*.left, *.right?) created for this
> particular conflict.

There definitely are additional files, just not called *.left, *.right.
After all, Subversion detects a conflict and writes the properties in
conflict to files so you can see what's in conflict. But those files
will be located *inside* that folder, not beneath it.

> Am I correct that the client doesn't currently have logic in place to
> handle the case where the directory itself is in conflict?

No. Because properties are considered binary, not text (at least that's
what the Subversion API docs tell you, most properties are really text).

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org