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

Pull as part of finalize_version() #39

Open
2 tasks
krlmlr opened this issue Jul 12, 2020 · 7 comments · May be fixed by #408
Open
2 tasks

Pull as part of finalize_version() #39

krlmlr opened this issue Jul 12, 2020 · 7 comments · May be fixed by #408
Assignees

Comments

@krlmlr
Copy link
Contributor

krlmlr commented Jul 12, 2020

  • Add commit_version(pull = FALSE)
    • With pull = TRUE we would fetch always and always uncommit + commit if behind master
  • Use pull = push in finalize_version()

Only if a remote is defined.

@krlmlr krlmlr added this to the 0.1.0 milestone Jul 25, 2021
@krlmlr krlmlr modified the milestones: 0.1.0, 0.1.1 Aug 2, 2021
@krlmlr krlmlr modified the milestones: 0.1.1, 0.1.2 May 12, 2022
@krlmlr krlmlr modified the milestones: 0.1.2, 0.1.1 Jul 25, 2022
@maelle maelle self-assigned this Jul 26, 2022
@maelle maelle linked a pull request Jul 26, 2022 that will close this issue
@maelle
Copy link
Member

maelle commented Jul 26, 2022

I've started working on a PR #408 but I need more info on what you mean by

With pull = TRUE we would fetch always and always uncommit + commit if behind master

If there are more commits on the remote branch

  • there might be conflicts, in that case error?
  • if not just rebase?
  • what means uncommit here? In the code there's uncommit if the last commit was a bump. Here which commits do you think should be undone, the ones from the remote?

@krlmlr
Copy link
Contributor Author

krlmlr commented Aug 31, 2022

We can try the equivalent of git pull --rebase and see how this works out.

@maelle
Copy link
Member

maelle commented Sep 1, 2022

there's relevant code in #408

@krlmlr
Copy link
Contributor Author

krlmlr commented Sep 20, 2022

Perhaps we a higher-level wrapper around pull + bump_version() + finalize_version() ?

06cba7f

@maelle
Copy link
Member

maelle commented Sep 26, 2022

what would it be called?

Words that come to mind: update (not clear with update_news()), commit (:upside_down_face: ), sync.

@krlmlr
Copy link
Contributor Author

krlmlr commented Sep 27, 2022

advance() ?

@krlmlr
Copy link
Contributor Author

krlmlr commented Feb 4, 2023

Not too important, since we now have the GHA workflow.

@krlmlr krlmlr modified the milestones: 0.1.1, 1.0.0: Done, for now Feb 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging a pull request may close this issue.

2 participants