-
Bug
-
Resolution: Fixed
-
High
-
None
-
Next minor release
-
Severity 2 - Major
This happens in 2.4 (73) for Mac. Works fine in 2.3.1.
Let's say you have commits:
D (newest)
C
B
A (oldest)
And you rebase interactively on A. In the 'Reorder and amend commits' window you'll see:
D
C
B
If you select D and click on 'Squash with previous' you'll get:
[2 commits]
__C
__D
B
And then you select [2 commits] and click on squash again:
[3 commits]
__D
__B
C
The order of the squashed commits is messed up in every step.
Thanks
| Form Name | |||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|
[SRCTREE-3979] Squash with previous in interactive rebase wrong order
I just tried that build and was able to repro on my first attempt. I'm short on time so I can't submit a screencast right now, but I'm sure you'll be able to repro yourself easily. Anyway, it seems the issue got fixed somewhere between 73 and 78. Thanks.
Please try https://bitbucket.org/atlassianlabs/sourcetree-betas/downloads/SRCTREE_3979.zip (2.4 beta 2, aka 73) and update this ticket ASAP. Thanks!
Intermediary betas aren't kept, I'll have to make a one-off build from the tag later this morning. Please watch this ticket and respond ASAP as we're beginning general rollout this week.
I just tried to repro on 2.4 (78) and it worked fine. I see that my original report was on 2.4 (73), if you can hand me a link to download that version (https://bitbucket.org/atlassianlabs/sourcetree-betas/downloads only contains the latest) I can try and we'll know if it got fixed between 73 and 78, or if it only repros under certain conditions. Thanks.
Can you elaborate a bit, with a screen recording if possible? I've attached screenshots of my attempt to reproduce and the results. Thanks!
Great, thanks Gabriel!