EIPs icon indicating copy to clipboard operation
EIPs copied to clipboard

Update EIP-1271: Fix example

Open PhABC opened this issue 3 years ago • 16 comments
trafficstars

PhABC avatar May 09 '22 16:05 PhABC

All tests passed; auto-merging...

(pass) eip-1271.md

classification
updateEIP
  • passed!

eth-bot avatar May 09 '22 16:05 eth-bot

I'm very confused by this PR. It allegedly is a PR against master, but in master this EIP is final rather than last call and this PR shows the EIP still in Last Call.

@PhABC Would you mind checking out your fork and making sure it is otherwise in sync with ethereum/EIPs and that your branch is rebased on master? GitHub shouldn't be having trouble here... so I'm just guessing at what might be wrong.

MicahZoltu avatar May 11 '22 07:05 MicahZoltu

There's a merge commit in this PR that could be messing things up? I'd recommend resetting this branch to the latest master and cherry-picking the changes you want (without the merge commit.)

SamWilsn avatar May 13 '22 19:05 SamWilsn

Is there some reason why you recommend cherry picking rather than git rebase @SamWilsn?

MicahZoltu avatar May 16 '22 06:05 MicahZoltu

Is there some reason why you recommend cherry picking rather than git rebase @SamWilsn?

I've had bad experiences rebasing branches that contain merge commits, but that might just be a me thing.

SamWilsn avatar May 20 '22 20:05 SamWilsn

Ah, good point. One way to deal with that would be to do:

# reset local branch pointer to point at `origin/master`, but leave working directory untouched.
git reset --soft origin/master
# commit working directory charges to local branch
git add .
git commit -m '...'
# force push local branch to origin
git push --force-with-lease origin

MicahZoltu avatar May 21 '22 04:05 MicahZoltu

There has been no activity on this pull request for two months. It will be closed in a week if no further activity occurs. If you would like to move this EIP forward, please respond to any outstanding feedback or add a comment indicating that you have addressed all required feedback and are ready for a review.

github-actions[bot] avatar Jul 20 '22 05:07 github-actions[bot]

hey @MicahZoltu @SamWilsn @PhABC, is this now good to merge?

Ivshti avatar Jul 20 '22 08:07 Ivshti

This PR still has something weird going on with it as it is allegedly against a Last Call EIP but this EIP is final. Someone needs to fix this, or submit a new issue that is correctly against the current head of this repository.

MicahZoltu avatar Jul 20 '22 08:07 MicahZoltu

Are we still interested in getting this merged? I'd prefer getting the git history cleaned up before doing so.

SamWilsn avatar Aug 09 '22 15:08 SamWilsn

The Git history is fine for me.

Pandapip1 avatar Sep 01 '22 02:09 Pandapip1

The Git history is fine for me.

You've got to stop making merge commits :rofl:

SamWilsn avatar Sep 12 '22 05:09 SamWilsn

@Pandapip1 @SamWilsn I think the latest editorial policy is to ignore EIP Walidator warnings for Final EIPs, right?

xinbenlv avatar Sep 24 '22 20:09 xinbenlv

Yes, that is correct. Adding to manual merge queue.

Pandapip1 avatar Sep 27 '22 12:09 Pandapip1

There has been no activity on this pull request for 2 weeks. It will be closed after 3 months of inactivity. If you would like to move this PR forward, please respond to any outstanding feedback or add a comment indicating that you have addressed all required feedback and are ready for a review.

github-actions[bot] avatar Oct 12 '22 00:10 github-actions[bot]

Waiting for manual merge

xinbenlv avatar Oct 12 '22 00:10 xinbenlv