Re: WC already locked error when merging in TSVN nightly

On 25.09.2012 05:09, Daniel Becroft wrote:
> On Mon, Mar 19, 2012 at 10:30 AM, Daniel Becroft <djcbecroft_at_gmail.com
> <mailto:djcbecroft_at_gmail.com>> wrote:
>
> Hi,
>
> Using: TortoiseSVN 1.7.99, Build 22664 - 32 Bit -dev, 2012/03/13
> 22:40:52
>
> I'm getting the following error message sporadically when attempting
> a merge through TSVN:
>
> Merging revisions 14782-14783 of svn://repository.url/repo/trunk
> into D:\work\foo\branches\branch-name, respecting ancestry
> 'D:\work\foo\branches\branch-name' is already locked via
> 'D:\work\foo\branches\branch-name'.
>
> I can't seem to create a stable reproduction recipe though. If I
> find out more, I'll post it.
>
>
> I managed to find a pattern with the occurences of this error. If I
> attempt to merge into a mixed-revision working copy, TSVN errors with
> the above error, but the command-line gives the "cannot merge into mixed
> revision WC" error. As soon as I update my WC, TSVN correctly performs
> the merge.
>
> Using: TortoiseSVN 1.7.99, Build 23265 - 32 Bit -dev, 2012/09/05 00:33:30

try the CL client with --allow-mixed-revisions: that's what TSVN passes
to the merge API.
Do you get the same error then with the CL client?

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3010141
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].