Odd working-copy lock while merging

[Dextor]

Hi,

I have a really odd locking issue that's preventing me from re-integrating
my team's dev branch into the Trunk. The merge gets so far (apparantly
sucessfully) and then reports the following issue in the merge
results/activity window:-

Working copy 'C:\Documents and Settings\SMITHJ\Desktop\New
Folder\Implementation\WebDataViewer\WebDataViewer\Analysis' locked
Error reading spooled REPORT request response
Please execute the 'Cleanup' command.

You can see that I'm merging into a temp folder on the desktop that contains
a working copy of the Trunk. The folder 'Analysis' is just a nothing special
sub-folder in the web project that contain about 5 files. The wierd thing is
that performing a 'test merge' runs file, so it's only the actual merge that
fails.

Anyone any ideas? I've tried all the obvious stuff like a refresh checkout,
cleanups etc but had no joy :O(

Thanks

Dex
--
View this message in context: http://www.nabble.com/Odd-working-copy-lock-while-merging-tp23272680p23272680.html
Sent from the tortoisesvn - users mailing list archive at Nabble.com.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1960597

To unsubscribe from this discussion, e-mail: [users-un...@tortoisesvn.tigris.org].

[Simon Large]

2009/4/28 Dextor <robby...@hotmail.com>:

> I have a really odd locking issue that's preventing me from re-integrating
> my team's dev branch into the Trunk. The merge gets so far (apparantly
> sucessfully) and then reports the following issue in the merge
> results/activity window:-
>
> Working copy 'C:\Documents and Settings\SMITHJ\Desktop\New
> Folder\Implementation\WebDataViewer\WebDataViewer\Analysis' locked
> Error reading spooled REPORT request response
> Please execute the 'Cleanup' command.
>
> You can see that I'm merging into a temp folder on the desktop that contains
> a working copy of the Trunk. The folder 'Analysis' is just a nothing special
> sub-folder in the web project that contain about 5 files. The wierd thing is
> that performing a 'test merge' runs file, so it's only the actual merge that
> fails.
>
> Anyone any ideas? I've tried all the obvious stuff like a refresh checkout,
> cleanups etc but had no joy :O(

Do you have a virus scanner running? They sometimes lock files when
they shouldn't.

Simon

--
: ___
: oo // \\ "De Chelonian Mobile"
: (_,\/ \_/ \ TortoiseSVN
: \ \_/_\_/> The coolest Interface to (Sub)Version Control
: /_/ \_\ http://tortoisesvn.net

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1961433

[Dextor]

Hi Simon,

I've just sorted it out :O) The problem was that in the branch I'd changed
the case of the 'Analysis' folder from 'analysis' to 'Analysis' using the
trick of appending an x to the name, committing, then renaming again to the
final name. Looks like the merge function gets the hump in this situation
since the folder still exists in the Trunk with a name that only differs by
letter case. It's odd that this problem reveals itself as a working copy
locking issue though. Thanks for you help though.

On to the next issue now: It's randomly 'skipping' files during the merge
that were added to the branch since it was copied from the Trunk. Humph.

Dex

--
View this message in context: http://www.nabble.com/Odd-working-copy-lock-while-merging-tp23272680p23278268.html

Sent from the tortoisesvn - users mailing list archive at Nabble.com.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1964316