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

Re: Crach when trying to reintegrate branch

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 24 Oct 2012 20:16:21 +0200

On 24.10.2012 12:16, Joakim Schramm wrote:
> I created a feature branch from another branch and used switch to checkout the new and have now done quite a lot of work there. Meanwhile I have "switch"ed back once to make a small change and commit in the original branch. I switched back and the change was merged to the feature branch. Since several commits have been done in the feature branch. Now I am ready and want to reintegrate the feature into the original branch.
>
> To do this I switch back to original branch, right click on the wc folder and select "merge" and then "reintegrate branch". I select the feature branch to integrate in to wc, click next and then "Test merge". At this stage TSVN stops working and I am encouraged to submit a crash report, which I have done as "Problem 6224" https://www.crash-server.com/Problem.aspx?ClientID=tsvn&Login=Guest&ProblemID=6224
>
> I haven't tried to actually merge it, just test, as I don't want to screw up my WC, but I need to have this merged soon as I have a deadline on Friday. I have several Externals as files, no folders, which may be worth mentioning as a potential source of problem.
>
> Otherwise TSVN spec below, on Windows 7 Ultimate SP1 - 64 Bit.

The crash happens inside the svn library. I sent a preliminary report to
the svn dev list:
http://thread.gmane.org/gmane.comp.version-control.subversion.devel/138269

You should step in there and answer any questions the developers there
might have for you to fix this problem.

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&dsMessageId=3023242
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-10-24 20:16:31 CEST

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