Skip to content
This repository was archived by the owner on Mar 24, 2026. It is now read-only.

[ci fw-only Java/act] Act: use act release version#2590

Merged
NateBrady23 merged 2 commits intoTechEmpower:masterfrom
greenlaw110:act-use-act-release-version
Mar 14, 2017
Merged

[ci fw-only Java/act] Act: use act release version#2590
NateBrady23 merged 2 commits intoTechEmpower:masterfrom
greenlaw110:act-use-act-release-version

Conversation

@greenlaw110
Copy link
Copy Markdown
Contributor

No description provided.

@NateBrady23 NateBrady23 merged commit 5a3fae7 into TechEmpower:master Mar 14, 2017
zloster pushed a commit to zloster/FrameworkBenchmarks that referenced this pull request Mar 21, 2017
* update act to release version 1.0.2

* update ACT README
@zloster
Copy link
Copy Markdown
Contributor

zloster commented Mar 22, 2017

I have NO idea why syncing my cloned repository in GitHub with merged in upstream:master commit will show up here as reference.
I'll contact GitHub support because several other pull requests have the same behaviour (#2596, #2569, #2541, #2542)

Update:
I've contacted GitHub support. The support person stated that this is the expected behaviour but I've pointed out the following:

Because currently each update of cloned repository that have "#NUMBER" in the commit message WILL be reflected in the parent repository pull request when the cloned repository is synced with GitHub. There are big projects with a lot of cloned repositories and their PRs will get "polluted" (may be it is not the best wording) when viewed through the web interface with messages "Someone has updated its own repo", "Someone other too", "And yet another one". Core team with 10 people using GitHub will generate 10 messages in each merged PR. And anyone that syncs from time to time his own cloned repo in GitHub will generate a message there. That doesn't sound right.

I'm awaiting for reply. Maybe someone from the TechEmpower team can also contact them? @nbrady-techempower @LadyMozzarella @knewmanTE @msmith-techempower

@NateBrady23
Copy link
Copy Markdown
Member

@zloster I'm a bit confused as I've only seen the proper behavior. The commit that references this PR has the PR # in the commit message doesn't it?

@zloster
Copy link
Copy Markdown
Contributor

zloster commented Mar 23, 2017

@nbrady-techempower Yes, it does.

I've just noticed that the commit in my master has different hash and parent: zloster@9a7c9d3
than the merged one in TechEmpower's master: 5a3fae7

Yet these two are exactly the same commit. And my master synced today is EVEN with TechEmpower's one: master...zloster:master

@zloster
Copy link
Copy Markdown
Contributor

zloster commented Mar 23, 2017

@nbrady-techempower One possible explanation is that somehow I've rewritten the history in the branch about the Servlets: 547ab2d The affected pull requests are just before my commit.
Then this PR gets merged, I'm syncing my master and everything seems fine?

@greenlaw110 greenlaw110 deleted the act-use-act-release-version branch March 23, 2017 20:30
@greenlaw110
Copy link
Copy Markdown
Contributor Author

no idea what's happening to your branch. Here is what I've done to submit the PR:

  1. create the feature (in this case: act-use-act-release-version) in my fork
  2. implement my changes
  3. test locally and commit my changes and push to my fork and get it passed the travis-ci tests
  4. git co master && git fetch upstream && git merge upstream/master
  5. git co <feature-branch> && git merge master
  6. submit the PR from the

@zloster
Copy link
Copy Markdown
Contributor

zloster commented Mar 27, 2017

@greenlaw110 Thank you for the information. The problem was something that I've done.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants