On 19 Mar, 13:16, RoboJ1M wrote:
> Hi,
>
> I'm having a problem with our new SVN system.
> Initially I thought it was a problem with TortoiseSVN but after
> discussing it on their mailing list and performing the same actions in
> command line svn it seems the problem further up the pipe.
>
> Anyway, I'm getting Out OfMemoryfor this command:
>
> svnmerge--non-interactivehttp://xxx/branches/Southwark_Permits"C:
> \xxx\trunk"
>
> System information:
>
> Server:
> Ubuntu Server 8.04
> svn, version 1.5.1 (r32289)
>
> Client:
> Win XP SP3 32bit
> 4GB (3.25GB available) of RAM
> svn, version 1.6.9 (r901367)
> compiled Jan 21 2010, 22:00:47
>
> Previous thread at
> TSVN:http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMess...
>
> I've tested tortoise on two machines, a clean check out andmerge
> fails (testmergesucceeds)
> Command line test succeeds on my machine.
>
> I know that's not a lot of information to go on, but if somebody can
> show me how to get more info out of svn I can post it.
>
> Many Thanks,
>
> James.
Hi,
Further to my original post I have reposted this on the svn-developers
list in hope of getting the route cause fixed.
I have also tested the merge on the Ubuntu server itself, where it
works perfectly.
However I am concerned about checking out and merging on Ubuntu,
copying to Windows, completing the merge by fixing conflicts and
testing the code before commiting it back on either the Windows
machine or Ubuntu machine.
Can I do that? Is it safe?
Thanks,
James.
