Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrating Pull Requests from ethereum/EIPs to ethereum/ERCs #8

Open
lightclient opened this issue Oct 25, 2023 · 14 comments
Open

Migrating Pull Requests from ethereum/EIPs to ethereum/ERCs #8

lightclient opened this issue Oct 25, 2023 · 14 comments
Labels

Comments

@lightclient
Copy link
Member

lightclient commented Oct 25, 2023

If you are trying to move a PR you made to ethereum/eips over to ethereum/ercs, the steps below will guide you through the process:

  1. Fork this repository within GitHub:

    1. Navigate to ethereum/ERCs.
    2. Find the "Fork" button in the upper right side of the screen and click it.
    3. Proceed with repository creation.
  2. Clone your fork locally:

    1. git clone https://github.com/{user}/ercs
  3. Enter the newly created ercs folder:

    1. cd ercs
  4. Add your fork of the EIPs repository as a remote:

    1. git remote add eips https://github.com/{user}/eips
  5. Fetch that remote to download your branches:

    1. git fetch eips
  6. Now checkout the branch related to your original PR:

    1. git checkout {branch}
  7. Rebase your branch against the ERCs repo:

    1. git rebase master
    2. Please note, you do not need to update any references of EIP to ERC; particularly in the relative links. Even though [ERC-X](./eip-x.md) doesn't correctly render in this repository, we're currently building the full eips.ethereum.org still in the ethereum/eips repository. So until we resolve this in Pending tasks for ERC migration #1, we will continue using this relative linking format.
  8. Push your branch to your ERCs fork:

    1. git push -u origin {branch}
  9. Now you can recreate your pull request:

    1. Navigate to https://github.com/ethereum/ERCs/compare
    2. Select your newly created fork and branch
    3. open a new PR to this repo.

Additional notes:

  • Do NOT link to ERCs using their filename. Link to ERCs using [ERC-XXXX](./eip-XXXX.md).
@SamWilsn SamWilsn changed the title EIPs -> ERCs migration guide Migrating Pull Requests from ethereum/EIPs to ethereum/ERCs Oct 25, 2023
This was referenced Oct 25, 2023
@TtheBC01
Copy link
Contributor

I think in step 4 of your instructions you need to flip remote and add around

@lightclient
Copy link
Member Author

@TtheBC01 you're right, thank you.

@TtheBC01
Copy link
Contributor

is it ok to just fork the new ERCs repo, add our ERC under the number that was assigned from the EIP repo and create a new PR? or is it preferred to stick to this rebasing procedure?

@lightclient
Copy link
Member Author

You can also do that if you prefer.

@cfries
Copy link
Contributor

cfries commented Oct 27, 2023

I mentioned this before, but what worked for me was to do everything up to step 7, then, not rebasing, creating a new branch for the PR from ERC master, then chery-picking manually all changes from the EIP pull request branch.

Step 7 did not work because I got conflicts due to the renaming of the folders.

@Xeway
Copy link
Contributor

Xeway commented Oct 27, 2023

For 8.i., the command that worked for me is git push origin HEAD:{branch}

Copy link

github-actions bot commented Nov 4, 2023

There has been no activity on this issue for 1 week. It will be closed after 3 months of inactivity.

Copy link

There has been no activity on this issue for 1 week. It will be closed after 3 months of inactivity.

Copy link

This issue was closed due to inactivity. If you are still pursuing it, feel free to reopen it and respond to any feedback.

@github-actions github-actions bot closed this as not planned Won't fix, can't repro, duplicate, stale Jan 11, 2024
@lightclient lightclient reopened this Mar 22, 2024
@github-actions github-actions bot removed the w-stale label Mar 23, 2024
Copy link

There has been no activity on this issue for 1 week. It will be closed after 3 months of inactivity.

@18211308
Copy link

Член

...

@github-actions github-actions bot removed the w-stale label Apr 27, 2024
Copy link

github-actions bot commented May 4, 2024

There has been no activity on this issue for 1 week. It will be closed after 3 months of inactivity.

eip-review-bot pushed a commit that referenced this issue May 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

6 participants