guberm / tortoisegit

Automatically exported from code.google.com/p/tortoisegit
0 stars 0 forks source link

Errors when choosing "Edit" during rebase #2516

Open GoogleCodeExporter opened 9 years ago

GoogleCodeExporter commented 9 years ago
What steps will reproduce the problem?
1. Rebase a branch with 3 commits
2. Skip the oldest, Edit the middle, Pick the newest
3. Note that during "Edit", you will get an "Amend" button. Click it.
4. Note that there will be a "fatal : Cannot amend during cherry-pick" or 
similar error message.
5. Note that upon completion, your branch will only contain 1 commit (the 
newest)

What is the expected output? What do you see instead?

I don't know what Edit does, but I suspect it is not supposed to be skipped 
with a fatal error message and an Amend button?

What version of TortoiseGit and msysgit are you using? On
what operating system?

1.8.12

Please provide any additional information below.

Original issue reported on code.google.com by mik...@gmail.com on 1 Jun 2015 at 1:16

GoogleCodeExporter commented 9 years ago
Just test your steps. Works for me.
Does the changed files of oldest commit related to the files of middle one?
Could you please try to provide a testing repository?

Original comment by yuelinho...@gmail.com on 1 Jun 2015 at 1:27

GoogleCodeExporter commented 9 years ago
Could you update to 1.8.14 and try?

Original comment by ch3co...@gmail.com on 5 Jun 2015 at 4:50

GoogleCodeExporter commented 9 years ago
Please provide a repository and concrete steps (i.e., which revisions to merge) 
to reproduce this issue. Otherwise we cannot reproduce and fix it.

Original comment by sstrickr...@googlemail.com on 16 Jun 2015 at 9:45