| Issue 2607: | "commit already exists (in the project)" when pushing sequence of two commits which exist as open changes - commits processed in wrong order? | |
| 3 people starred this issue and may be notified of changes. | Back to list |
Affected Version: 2.8.3 What steps will reproduce the problem? 1. Create commit aa with Change-Id AA 2. As a child commit, create commit bb with Change-Id BB 3. `git push HEAD:refs/for/master` 4. `git rebase -i HEAD~2`; edit the commit message of commit aa (but keep the Change-Id intact) -> HEAD of the local repository is at commit bb', and bb' has aa' as parent commit 5. git push HEAD:refs/heads/master Results: * master is updated on the remote repository to point to bb' (expected) * A new patch for commit bb' is added to change BB, and the change is marked as "Merged" with the comment "Change has been successfully pushed." (expected) * Change AA still only contains one patch with commit aa (not expected). Change AA should have been updated and marked as "Merged" just like change BB. * The push command returns with an error message "commit already exists (in the project)" (not expected). The push should have succeeded. It seems that the two pushed commits are processed in the wrong order. This would explain the symptoms. Concrete changes & commits for which the error as described above occurred: * Change BB: https://git.eclipse.org/r/#/c/24270/ * Change AA: https://git.eclipse.org/r/#/c/24988/ * Commit aa': http://git.eclipse.org/c/tycho/org.eclipse.tycho.git/commit/?id=22508a6acb6c996997c0ade7479872cc2c0b95e9
Apr 22, 2014
Project Member
#1
david.pu...@sonymobile.com
Cc:
bruce.zu@sonymobile.com
Apr 22, 2014
>Change AA still only contains one patch with commit aa (not expected). Change AA should have been updated and marked as "Merged" just like change BB. right.
Apr 22, 2014
https://gerrit-review.googlesource.com/#/c/56272
Apr 22, 2014
(No comment was entered for this change.)
Status:
ChangeUnderReview
Apr 22, 2014
(No comment was entered for this change.)
Status:
Submitted
Labels: FixedIn-2.9
May 8, 2014
Issue 2626 has been merged into this issue.
May 8, 2014
(No comment was entered for this change.)
Labels:
-FixedIn-2.9 FixedIn-2.8.5
May 11, 2014
(No comment was entered for this change.)
Status:
Released
|
|
| ► Sign in to add a comment |