[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Can't get lock on conflicted file

From: <martin.demberger_at_sdm.de>
Date: 2006-01-31 13:52:11 CET

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.

Cu
Martin

---
Martin Demberger mailto:martin.demberger@sdm.de
sd&m AG http://www.sdm.de
software design & management
Carl-Wery-Str. 42, 81739 Muenchen, Germany
Tel +49 89 63812-859
Received on Tue Jan 31 14:00:19 2006

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.