Re: TortoiseSVN cannot acquire lock when in conflict?

Matthew wrote:
> I noticed that in the final stable release (1.2.6) a conflict after a merge
> cannot be solved when using svn:needs-lock.
>
> What did I do:
> - Merged a branch with multiple revisions with my WC.
> - Acquired lock (at least that's what I thought)

How did you manage it in that order? If svn:needs-lock is set, your WC
file should be read-only, so the merge should fail anyway. Try again
getting the lock first, then merging.

> - Got 2 conflicts, so started the built-in conflictsolver.
> - pressed save ... file is still read-only.
>
> Expected:
> - No trouble at all, solved problem
>
> Fix temporarily:
> - disable read-only option in explorer (file-property)
>
> I could not find anything in the current issue-tracker, so I think this is a
> minor bug.

Maybe it is a subversion bug that the read-only error is not reported as
such.

Simon

-- 
        ___
   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