Bug: Merge --> Show Log Hangs

[David Saylor]

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

Subversion 1.9.2, -release

apr 1.5.2

apr-util 1.5.4

serf 1.3.8

OpenSSL 1.0.2d 9 Jul 2015

zlib 1.2.8

SQLite 3.8.11.1 

Would really appreciate your help!

Thanks and best regards,

David

[Stefan Küng]

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-un...@tortoisesvn.tigris.org].

[David Saylor]

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

[Stefan Küng]

On 17.11.2015 08:09, David Saylor wrote:
> 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.

Try a nightly build: there were some networking issues fixed in the svn
library since the 1.9.2 release, maybe that's the problem?

And try to run an
$ svnadmin recover
on the repository.

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=3146998

[Florian Demski]

The same here. Switching to other repositories and cleaning up did not help.

svnadmin recover complains about a wrong format number (something like 3 or 4 expected, but got 12).

A recent nightly build led to the same problem.
The only solution that helped: going back to 1.9.1.

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