Was there anything in the log files?

Re-assigning it to Kin-Hong who is owner of Rebase feature.

Was there anything in the log files?

The log files from ~/.datastudio/logs don't get modified when ADS freezes, and nothing is printed in the View Log either before it freezes.

On my system I can reproduce this every time.

I am not able to reproduce this error. I tried it on Mac OSX and Windows 7, with both View Log and Git Repository windows opened. Could we try to isolate this issue with:

1. Using a test case without detached head. Simple two branches with conflicting changes, then rebase.

2. Running ADS on Windows 7 and/or Mac OSX

I am able to reproduce the issue without having detached HEAD. I have attached my test git repository. After following the instructions to create conflict,

1) Checkout master

2) Click Rebase and select the other branch. ADS freezes after that.

Yes, as mentioned by Asif, the freezing occurs also with a simple conflicting change, with no detached Head; tested on Ubuntu.

Does it happen on Windows 7 or OSX?

I am on Ubuntu 12.04 LTS

AD Studio says,

Operating Environment: Linux (3.2.0-39-generic, amd64) / UTF-8 / en / US / Sun Microsystems Inc. 1.6.0_29-b11

Does it happen on Windows 7 or OSX?

I can only test on Ubuntu, and occasionally on Windows; using Windows 8 x64 now, I cannot reproduce the bug, therefor it might be a Ubuntu only bug.

I was not able to reproduce it in Win 7, OSX or Ubuntu 12.04.1 LTS or 12.04.2 LTS. Did you try to install the software and still able to reproduce the bug or are you running it from the development environment ?

Version: 14.0-dev-23

Build #: 31672

On further investigation, this issue seems to be more specific to the java version.

I can still reproduce this issue when I use datastudio.sh,

Operating Environment: Linux (3.2.0-39-generic, amd64) / UTF-8 / en / US / Sun Microsystems Inc. 1.6.0_29-b11

Then I launched the same version of ADStudio using datastudio-bundled.sh, this issue no longer happens,

Operating Environment: Linux (3.2.0-39-generic, amd64) / UTF-8 / en / US / Sun Microsystems Inc. 1.6.0_35-b10

@Cristian,

To test rebase feature further you could launch ADStudio using datastudio-bundled.sh

@Cristian,

To test rebase feature further you could launch ADStudio using datastudio-bundled.sh

Yes, most of the time the Java bundled version is used (i.e., opening ADS via datastudio-bundled.sh), as it was when reporting this issue (mentioned in the first post), only if there seems to be a Java version specific issue, ADS is opened via datastudio.sh.

As with the current available testing build, ADS 14 Dev 24, with bundled Java version 1.6.0_35-b10, the bug is reproducible on Ubuntu 12.10.

However testing via datastudio.sh with Java version 1.7.0_09-b05 on Ubuntu 12.10, the bug is NOT reproducible.

@Sachin,

As this issue turns out to be java environment specific, please let us know if we can close this issue or any further investigation is required.

I'll take ownership, as I need to review the JRE we bundled for 14.0