TortoiseSVN cannot acquire lock when in conflict?

Hello tortoise-developers,

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)
- 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.

Matthew.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Dec 6 13:23:36 2005