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

Jump to bottom

hg version detection fails for uncommited merges #3853

Closed
DorpsGek opened this issue May 22, 2010 · 1 comment
Closed

hg version detection fails for uncommited merges #3853

DorpsGek opened this issue May 22, 2010 · 1 comment
Labels
flyspray This issue is imported from FlySpray (https://bugs.openttd.org/)

Comments

@DorpsGek
Copy link
Member

planetmaker opened the ticket and wrote:

When there's an uncommited merge within a mercurial repo the use of "hg parents" returns both hashes. Combined they don't constitute a valid version anymore which leads to something like

make run
abort: unknown revision '907f1c3d3119999547943a9a155626351aebcb56c9d3756b181e2d730b14d6615cd830112ba88df5'!
make[1]: Nothing to be done for `all'.
abort: unknown revision '907f1c3d3119999547943a9a155626351aebcb56c9d3756b181e2d730b14d6615cd830112ba88df5'!
[SRC] DEP CHECK (all files)
abort: unknown revision '907f1c3d3119999547943a9a155626351aebcb56c9d3756b181e2d730b14d6615cd830112ba88df5'!

The attached patch modifies the hash retrieval a bit so that always a valid version is found. In case of two parents it will take the first one.

Attachments

Reported version: Version?
Operating system: All

This issue was imported from FlySpray: https://bugs.openttd.org/task/3853
@DorpsGek
Copy link
Member Author

Rubidium closed the ticket.

Reason for closing: Fixed

In r19898

This comment was imported from FlySpray: https://bugs.openttd.org/task/3853

@DorpsGek DorpsGek added flyspray This issue is imported from FlySpray (https://bugs.openttd.org/) Build system labels Apr 7, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
flyspray This issue is imported from FlySpray (https://bugs.openttd.org/)
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@DorpsGek