Re: Can't get lock on conflicted file

martin.demberger@sdm.de wrote:
> Hi,
> if I got an conflict on a binary file (e.g. on a merge), I can't get the
> lock on the conflicted file.
> The only posibility is to save the merged file with another name, revert
> the changes and overwrite it with the merged file.

Of course you can't. The file is already conflicted, which means someone
else already modified and committed that file. So your file isn't at
HEAD anymore. You can only lock files which are at HEAD.

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