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

Fix order of commits #5

Closed
PatrickFerber opened this issue Jul 16, 2020 · 5 comments
Closed

Fix order of commits #5

PatrickFerber opened this issue Jul 16, 2020 · 5 comments

Comments

@PatrickFerber
Copy link
Member

PatrickFerber commented Jul 16, 2020

For the users cleaned up and converted repository to be compatible with our primary git repository, the users repository need to have the commits in the right order. This has to be ensured!

  1. clone the Mercurial master repository anew (do not allow the user to use a local version, because until recently the clone from hg.fast-downward.org was also in a wrong order)
  2. strip away new commits from master repository
  3. pull the user repository in the stripped master repository
    -> your changes are in the repository and the old commits have the right order!
@maltehelmert
Copy link
Contributor

I don't understand who this comment is directed to. Who is the "you" we're talking to here? The user of the script? Which commits are meant by "new commits" in point 2, and why do they need to be stripped? No commits need to be stripped from the master repository, and clearly if the user's commits are stripped, they won't be converted. Under point 1, I don't understand what the part in parentheses wants to stay. Is "do now" a typo?

@PatrickFerber
Copy link
Member Author

update initial post (you -> user, fix typo, rephrasing)

In the case the user did his developments on the 'default' branch, we need to strip the commits on the default branch.
Furthermore, if I convert an X year old Fast Downward repository, I would not expect that the new developments of Fast Downward will be pulled into my repository.

@PatrickFerber
Copy link
Member Author

Here is the PR: #6

@maltehelmert
Copy link
Contributor

maltehelmert commented Jul 16, 2020

I see. (Florian explained the rationale to me.) I wouldn't have offered support for conversion for people that are not ready to pull from the final hg version. I think the use case for a git conversion compatible with our repository is weak for people who are not willing to get at least that up to date. But if that's what you prefer, I won't object.

@silvansievers
Copy link
Contributor

I also previously advocated against providing support for people who don't want to update their branches to the latest default.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants