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

Need SOP for avoiding ID clashes when 1 editor has multiple branches awaiting merge #13812

Closed
dosumis opened this issue Jul 5, 2017 · 9 comments
Assignees

Comments

@dosumis
Copy link
Contributor

dosumis commented Jul 5, 2017

Branches that are expected to be long require their own ID range. But what should we do in the case of branches with new terms that stick around for a couple of days awaiting review? In these cases, starting a new branch and adding new terms will => ID clashes. Easiest way to avoid this is to check the highest new ID in the old branch and set ID counter to start from this ID + 1.

@ukemi
Copy link
Contributor

ukemi commented Jul 5, 2017

If you are using your ID range, doesn't asking Protege to remember identifiers between sessions circumvent this?

@krchristie
Copy link
Contributor

I also thought Protege remembers this. I encountered something that looked odd a few weeks ago and ended up remaking a term several terms without committing any except the last time. Protege gave it a new & different ID every time even though the earlier terms were never committed.

@dosumis
Copy link
Contributor Author

dosumis commented Jul 5, 2017

I had an ID clash from twin branches quite recently. But now I see that I don't have the 'remember ID between sessions' option clicked. Wonder if this works when switching ID setup (something I also do quite a bit, e.g. if editing CL or RO)?

@cmungall
Copy link
Member

cmungall commented Jul 6, 2017 via email

@ukemi
Copy link
Contributor

ukemi commented Jul 6, 2017

And if we have a collision, what do we do, hand-edit the file. It seems better if we try very hard to catch this upstream. If I recall correctly, it remembers even when you switch ID setup, but I think I tried that ages ago on a much earlier version. You should try testing that again.

@pgaudet
Copy link
Contributor

pgaudet commented Aug 31, 2020

@balhoff Can a check be added for this ?

@balhoff
Copy link
Member

balhoff commented Nov 6, 2020

I have a proposal for managing this in ontodev/robot#763

@dosumis
Copy link
Contributor Author

dosumis commented Nov 6, 2020

I'm pretty sure that the 'remember ID' option is sufficient to avoid clashes of this type - as long as you do all your edits on one machine.

@pgaudet
Copy link
Contributor

pgaudet commented Aug 24, 2022

I dont think this is a problem anymore

@pgaudet pgaudet closed this as completed Aug 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

8 participants