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

Re: Bug: Merge --> Show Log Hangs

From: David Saylor <david.p.saylor_at_gmail.com>
Date: Mon, 16 Nov 2015 23:09:35 -0800

Thanks for your response Stefan.

I believe I cleared what you referred to. That is Settings --> Saved Data
--> press Clear buttons.

I don't think my issue is with the network. I am able to get the Log for
any particular file or directory. Also, I have the same issue from my home
computer and from my work computer, both running 1.9.2, but not on our
virtual machines which are 1.8.10.

The SVN server we have is CollabNet ... I don't know if that matters.

Do you have any ideas for what I could try?

Best regards,
David

On Mon, Nov 16, 2015 at 10:38 AM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:

> On 16.11.2015 06:09, David Saylor wrote:
> > I'm encountering an issue when I'm merging from a branch into the
> > trunk. When I try to merge from a branch into the trunk, and click on
> > the Show Log button to select revisions, the "Select revision range"
> > screen hangs and does not show the log. It also does not Cancel, and
> > must be forcibly closed. However, Show Log for folders and items works
> > as expected.
> >
> > This is a new issue since installing the 1.9.2 version. It was working
> > before installing this version. I have another computer running
> > TortoiseSVN 1.8.10, Build 26129 which does not have this issue. I do
> > not know which version it changed at.
> >
> > Steps to reproduce:
> > Right click root of trunk. Select Tortoise SVN --> Merge...
> > Accept default merge type: Merge a range of revisions. Press Next.
> > The correct branch name is already populated in URL to merge from.
> > Select Specific range option and press Show log.
> > The Select revision range window is shown, but does not populate, and
> > does not respond to Cancel button.
> >
> > Setup: Windows 10.
> > TortoiseSVN 1.9.2, Build 26806 - 64 Bit , 2015/09/22 18:33:30
>
> I have the same setup here, and I'm doing a lot of merges like this.
> Works fine for me here.
>
> If the cancel button does not work, usually that means there's a network
> problem.
> But to be sure, first try and clear the log cache in the settings dialog.
>
> 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=3146838
>
> To unsubscribe from this discussion, e-mail: [
> users-unsubscribe_at_tortoisesvn.tigris.org].
>
>

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-11-17 08:10:25 CET

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