Pushing branch with merged develop fails
- In the past I merged
develop
into thecif2dmm
branch, see !349 (comment 1002884) - I added new commits to the branch.
- As there are new changes in the checkers, I merged
develop
again. (Same command sequence as previously.) - I added some more commits.
And now push fails with an error.
$ git push project 368-2-cif2dmm
Pushing to gitlab.eclipse.org:eclipse/escet/escet.git
Enumerating objects: 312, done.
Counting objects: 100% (301/301), done.
Delta compression using up to 4 threads
Compressing objects: 100% (115/115), done.
Writing objects: 100% (242/242), 78.54 KiB | 15.71 MiB/s, done.
Total 242 (delta 143), reused 137 (delta 88), pack-reused 0
remote: Resolving deltas: 100% (143/143), completed with 26 local objects.
remote: GitLab: You cannot push commits for '<anonymized-email-that-is-not-my-email>'. You can only push commits if the committer email is one of your own verified emails.
To gitlab.eclipse.org:eclipse/escet/escet.git
! [remote rejected] 368-2-cif2dmm -> 368-2-cif2dmm (pre-receive hook declined)
So I am apparently pushing commits that I didn't commit.
Checking the log (and shortened sequences of commits in the same branch a bit):
* ab870560 (HEAD -> 368-2-cif2dmm) #368 Adapt the CifToDmm code for the modified checkers.
* 53440ceb #368 Cleanup and move the various prechecker checks.
* 70e50256 #368 Add common strings function for creating 'A or B or .. C' text.
* 5dbaa35c #368 Extend CifTextUtils.kindToStr with support for SupKind.NONE.
* 4d17e27d #368 Export org.eclipse.escet.cif.common.checkers.messages package.
* cb944833 Merge branch 'develop' into 368-2-cif2dmm
|\
| * c4cea7d3 (project/develop, develop) Merge branch '419-add-bridge-as-cif-example' into 'develop'
| |\
| | * 9c53c9cc (project/419-add-bridge-as-cif-example) #419 More user-friendly error when simulating without supervisor.
| | * d7610873 #419 SVG image improvements.
@@@ Deleted some #419 to shorten the log
| | * 658a6807 #419 Added Oisterwijksebaan bridge real-world CIF synthesis example.
| * | b6cd4805 Merge branch '425-update-release-process-documentation' into 'develop'
| |\ \
| | |/
| |/|
| | * d277c642 (project/425-update-release-process-documentation) #425 Release process updates.
| |/
| * 6f723d45 Merge branch '347-add-dark-theme-support-for-setext-based-text-editors' into 'develop'
| |\
| | * 09aeb237 #347 Document reason for using internal Eclipse APIs in the code.
@@@ Deleted some #374 to shorten the log
| | * 30395a1d #347 Added dark/light theme support to SeText base text editor.
| * | 746d02b9 Merge branch '398-various-checks-for-cif-checker-crash-for-violations-in-the-root-of-the-specification-2' into 'develop'
| |\ \
| | |/
| |/|
| | * 59a10a9e #398 Small comment/naming improvements.
@@@ Deleted some #398 to shorten the log
| | * 8b0f34c7 #398 Prevent crash for check violations reported on the top level scope.
| |/
| * 230e464d Merge branch '391-release-notes-v0-7-m1' into 'develop'
| |\
| | * 2293b8b2 #391 Updated release notes for v0.7-M1.
| * | 9d1e25c2 Merge branch '405-cif-event-based-language-equivalence-check-generates-incorrect-counterexamples' into 'develop'
| |\ \
| | |/
| |/|
| | * b38f0e25 #405 Slightly simpler for-loop condition in LangEquivCalculation.
@@@ Deleted some #405 to shorten the log
| | * b1eda96e #405 Prevent lang equiv chk counter example generation stack overflow.
| * | d14ca085 Merge branch '412-get-rid-of-versions-in-category-xml' into 'develop'
| |\ \
| | * | 9aef3d9d #412 Remove feature url/version from category.xml + update dev docs.
| | |/
| * | 2c0cd5b1 Merge branch '411-add-option-to-automatically-submit-approval-requests-for-new-third-party-dependencies' into 'develop'
| |\ \
| | * | 52344450 #411 Enable automatic reporting of new dependencies to Eclipse IP Team.
| | |/
| * | 487a8532 Merge branch 'add-confluence-check' into 'develop'
| |\ \
| | |/
| |/|
| | * 27ffb2c1 #145 Process review comments.
@@@ Deleted some #145 to shorten the log
| | * a80265d6 #145 Move printing results to application class.
@@@ Below is in the repo already.
* | | 22189bdc (project/368-2-cif2dmm) #368 Apply suggested text changes.
* | | e965d6bf #368 Delete prechecker flag, adjust for new checkers.
* | | 9ad49aa8 #368 Add new checks,
* | | 688a5120 Merge branch 'develop' into 368-2-cif2dmm
The left-most line is the branch, and all commits at it are mine.
Assuming it wants to push all commits in HEAD
that are not in project/368-2-cif2dmm
, I asked a list of those with git log project/368-2-cif2dmm..HEAD
.
It dumped all commits above except for the bottom 4 at 22189bdc (project/368-2-cif2dmm)
and below.
In other words, it tries adding a large chunk of develop
to my branch.
I wondered why this happens, and I think the answer is in 22189bdc
to 688a5120
(inclusive). None of these are in develop, so it must compensate for that in some way. Judging by the error it apparently copies them into the branch (no doubt by heavy sharing), even though the graph tells a different story.
To me, this means merging develop into branches implies pending death to the branch.