On 19 Mar, 11:42, RoboJ1M <robo..._at_gmail.com> wrote:
> On 18 Mar, 21:28, Stefan Küng <tortoise..._at_gmail.com> wrote:
> > On 18.03.2010 17:34, RoboJ1M wrote:
> > > Hi,
> > > I'm trying to merge a branch back to trunk in TortoiseSVN and it's
> > > crashing part way through.
> > > Here are my system details:
> > > WinXP SP3
> > > TortoiseSVN 22.214.171.12415 (also tried TortoiseSVN-126.96.36.19999)
> > > svn, version 1.5.1 (r32289)
> > > First I check out a working copy of trunk.
> > > Then I click SVN --> Merge
> > > I choose to merge branches/Southwark_Permits (The mergeinfo on that
> > > folder is /trunk:288-305)
> > > I select Merge a range of revisions
> > > I leave revision range blank
> > > Merge depth is Working Copy
> > > All tick boxes are OFF
> > > Compare whitespaces is ON
> > > Test Merge works all the way though, no errors.
> > > Real merge gets to the first conflict and I select Resolve All Later
> > > This is shown on the screen (with some bits blanked out)
> > > Command: Merging revisions 1-HEAD of xxx/branches/Southwark_Permits
> > > into xxx\trunk, respecting ancestry
> > > Merging r288 through r322: xxx\trunk
> > > Updated: xxx\trunk\xxx\Web.config
> > > Updated: xxx\trunk\xxx\xxx.csproj
> > > Updated: xxx\trunk\xxx\xxx.asmx.cs
> > > Updated: xxx\trunk\xxx\xxx.Publish.xml
> > > Updated: xxx\trunk\xxx\xxx.sln
> > > Updated: xxx\trunk\xxx\xxx.csproj
> > > Updated: xxx\trunk\xxx\App.config
> > > Conflicted: xxx\trunk\xxx\Form1.Designer.cs
> > > Conflicted: xxx\trunk\xxx\Form1.cs
> > > Then I get :
> > > Microsoft Visual C++ Runtime Library
> > > Runtime Error!
> > > Program: TortoiseProc.exe
> > > Follow by:
> > > AppName: tortoiseproc.exe AppVer: 188.8.131.5299 ModName:
> > > libapr_tsvn.dll
> > > ModVer: 184.108.40.206 Offset: 000026a7
> > > There's more but it's verbose so it's at the end of this message.
> > > And then the app is gone. I can clean up the working copy but Revert
> > > will crash as well.
> > > It's same with both the latest stable version and the nightly build
> > > I've tried.
> > > Can somebody assist me with this please?
> > Can you try the merge with the command line client?
> > $ svn merge -r1:HEAD xxx/branches/Southwark_Permits path\to\trunk
> > The crash appears in the apr library, which means the problem is in the
> > svn library which executes the merge.
> > If you can get the command line client to crash as well, you can report
> > this on the Subversion mailing list and provide any information the devs
> > there need to fix this.
> > Stefan
> > --
> > ___
> > oo // \\ "De Chelonian Mobile"
> > (_,\/ \_/ \ TortoiseSVN
> > \ \_/_\_/> The coolest Interface to (Sub)Version Control
> > /_/ \_\ http://tortoisesvn.net
> > ------------------------------------------------------http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMess...
> > To unsubscribe from this discussion, e-mail: [users-unsubscr..._at_tortoisesvn.tigris.org].- Hide quoted text -
> > - Show quoted text -
> Good idea, I should have thought of that.
> This is slightly more damning:
> Out of memory - terminating application.
> This application has requested the Runtime to terminate it in an
> unusual way.
> Please contact the application's support team for more information.
> >svn --version
> svn, version 1.6.9 (r901367)
> compiled Jan 21 2010, 22:00:47
> Copyright (C) 2000-2009 CollabNet.
> Subversion is open source software, seehttp://subversion.tigris.org/
> This product includes software developed by CollabNet (http://www.Collab.Net/).
> I guess it's a problem with SVN then, not Tortoise.
> For reference, this is a 32bit machine with 4GB (3.25GB)
> If I post on their user mailing list, what's a good way to reference
> this thread?
> bc2e98006d73d2ac" Is that any good?
> Anyway, thanks for the help, I shall continue this with the SVN
> To unsubscribe from this discussion, e-mail: [users-unsubscr..._at_tortoisesvn.tigris.org].- Hide quoted text -
> - Show quoted text -
I'm not really getting anything from the subversion-users group yet.
My thread is here:
If anybody from here could offer some assistance that would be great.
This is our new, live SVN service. We've migrated from CVSNT and a
critical failure like this would be disastrous! :(
As a possible workaround, what would be the feasibility of this:
1) Perform the merge to a working copy local on the SVN server (ubuntu
2) Copy it off there and perform the rest of the merge (testing,
3) Commit it back.
Line ending spring immediately to mind (LR not CRLF?)
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-03-22 11:34:01 CET