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

Migrate Commit History? #671

Closed
mmcky opened this issue Dec 18, 2022 · 5 comments
Closed

Migrate Commit History? #671

mmcky opened this issue Dec 18, 2022 · 5 comments

Comments

@mmcky
Copy link
Contributor

mmcky commented Dec 18, 2022

When cleaning up the API the commit history is not longer super clear from #601

For example arma.py was migrated to _arma.py (with arma.py retained to preserve backward compatibility).

Can the commit history of arma.py be concatenated to _arma.py?

@Smit-create
Copy link
Member

I tried to save the commit history to the new file using git mv. I see that the reason it got lost is due to merge conflicts and when I resolved those conflicts manually, it somehow got messed up. I will try to look into this.

@Smit-create
Copy link
Member

One option is that we can revert that PR and then I'll come up with a new PR fixing that in one go such that we don't have any merge conflicts.

@Smit-create
Copy link
Member

@oyamad @mmcky Should I revert the PR and complete it in one go? such that we don't have any conflicts and merge it on priority?

@Smit-create
Copy link
Member

I checked by merging #674 into a copy of main branch in my fork and found that the commit history is not overridden, i.e., it uses the same old commits: https://github.com/Smit-create/QuantEcon.py/tree/check_671_merge

Another solution that I found is this:

  1. Revert PR MAINT: Distinguish between private and public namespaces #601 and merge it in the main.
  2. Merge Fix Commit history of API changes #674 into the main and you can see the results as expected. This is how it would look: https://github.com/Smit-create/QuantEcon.py/commits/check_671_5/quantecon/_arma.py

@oyamad
Copy link
Member

oyamad commented Jan 2, 2023

Resolved by #682

@oyamad oyamad closed this as completed Jan 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants