130
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
this post was submitted on 18 Jul 2024
130 points (97.1% liked)
Programming
17314 readers
69 users here now
Welcome to the main community in programming.dev! Feel free to post anything relating to programming here!
Cross posting is strongly encouraged in the instance. If you feel your post or another person's post makes sense in another community cross post into it.
Hope you enjoy the instance!
Rules
Rules
- Follow the programming.dev instance rules
- Keep content related to programming in some way
- If you're posting long videos try to add in some form of tldr for those who don't want to watch videos
Wormhole
Follow the wormhole through a path of communities !webdev@programming.dev
founded 1 year ago
MODERATORS
Rebasing updates the commit ids. It's fine. Commit IDs are only local anyway.
One thing that makes mercurial better for rebase based flows is obsolescence markers. The old version of the commits still exist after a rebases and are marked as being made obsolete by the new commits. This means somebody you've shared those old commits with isn't left in hyperspace when they fetch your new commits. There's history about what happened being shared.
Whay do you mean by that?
You and I both clone a repo with ten changes in it. We each make a new commit. Both systems will call it commit 11. If I pull your change into my repo your 11 becomes my 12.
The sequential change IDs are only consistent locally.
Got it! Are they renumbered chronologically? Like if my 11 was created before your 11, would yours be the one that's renumbered?
No. They are not renumbered. Your 11 is always the same commit. It's consistent locally (which is what I mean by "local only") otherwise they'd change under your feet. You just can't share them with others and expect the same results. You have to use the hash for that.
That's exactly the same in
git. The old commits are still there, they just don't show up ingit logbecause nothing points to them.Old, unreachable commits will be garbage collected.
Does that not happen with Mercurial? If not that seems like a point against it.
I'm confused, the behavior you just said was "exactly the same in git" is now a problem for Mercurial?
I thought it was exactly the same based on the description.
No the old commit is always there, marked as obsolete with the information of what it became. No holes in history. (Assuming you use the obsolecense markers)