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.

Sign up for GitHub

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

Jump to bottom

Merge changes from 1.2 format repo #11244

Merged
merged 2 commits into from
Jan 23, 2018
Merged

Merge changes from 1.2 format repo #11244

merged 2 commits into from
Jan 23, 2018

Conversation

camelus
Copy link
Contributor

@camelus camelus commented Jan 18, 2018

No description provided.

@camelus
Partial format upgrade (conf-python-2-7.1.0)
7239417 
Update done by Camelus based on opam-lib 2.0.0~beta6
There were conflicts with changes on the current 2.0.0 branch, so this is left unmerged. Conflicting files:
  - packages/conf-python-2-7/conf-python-2-7.1.0/opam
@hannesm
Copy link
Member

hannesm commented Jan 22, 2018

@AltGr what's the status with this PR? it has a merge conflict, but has camelus already merged these commits into 2.0.0 branch? It would be useful (for at least me as a maintainer of this repository) to have a rough description of how opam1-opam2 and camelus is supposed to work on this repository. thx!

@AltGr
Copy link
Member

AltGr commented Jan 23, 2018 •
edited
Loading

Camelus will first check if the rewrite for the files you modified is current, i.e. if the automatic rewrite of these files before your patch match the files on the 2.0.0 branch. If that is the case, it will rewrite the files as you modified them, and push the new version to the 2.0.0 branch without asking.

If not, however, it will assume that there has been changes to the 2.0.0 branch that weren't reflected in the master version you modified, so it'll rewrite the change but file that as a PR so that nothing is lost. The purpose is that we can start accepting PRs to the 2.0.0 branch while still having the rewrite in place.

However, at the moment, there are almost no such changes, and it seems that the conflict is due to Camelus missing some pushes to the repo :/. So in fact, the 2.0.0 branch was lagging behind. I'll see why that is so, but in the meantime, it's safe to merge this by taking the changes from your branch everywhere.

EDIT: no the reason seems different, investigating...

@AltGr
Copy link
Member

AltGr commented Jan 23, 2018

Right, the conflict was only due to an extra leading / in extra-files, likely due to a rewriting bug.

@AltGr AltGr merged commit 6ef74e2 into 2.0.0 Jan 23, 2018
@samoht samoht deleted the camelus-2bec2453 branch September 21, 2018 07:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@camelus @hannesm @AltGr