|
|
Log in / Subscribe / Register

Raymond: bzr is dying; Emacs needs to move

Raymond: bzr is dying; Emacs needs to move

Posted Jan 15, 2014 5:43 UTC (Wed) by eliz (guest, #94829)
In reply to: Raymond: bzr is dying; Emacs needs to move by mathstuf
Parent article: Raymond: bzr is dying; Emacs needs to move

> OK, now I understand *what* is happening. Still don't understand the reasoning.

Well, I didn't design that stuff, so I can only try to guess the reasons. If you want the definitive answer, I suggest to ask on the Bazaar mailing list, where bzr's designers still lurk.

My take on the reasoning is that bzr really _wants_ to distinguish between "my" history and "yours", i.e. it wants the history in each branch to reflect the sequence of operations in that branch. Therefore, commits made in the branch and commits merged from another branch are treated differently, and shown as such in the DAG.

IOW, the interpretations of "history" in bzr and in git are subtly, but fundamentally different. For bzr, it is the actual sequence of events that added revisions to the branch, in addition to the ancestry information. For git (IIUC), it is _solely_ the ancestry, i.e. the parent-child relationships between the commits, and the "historic" aspect shows only in the direction of the DAG edges.

> I could see some of the reasoning being to keep old numerical IDs the same, but that sounds like the tail wagging the dog to me

Same here: I think the numerical revnos are the (logical) consequence, not the root cause. But again, this is just my take.

> So if A *merges* 'g' back, bzr would see 'e' and 'f' as its parents (and already in the history of the current commit), see that 'f' is on the mainline, rewrite 'g's parent ordering to make 'f' the first parent, then make 'h' as part of A's mainline

No, I think bzr will just say "nothing to merge" and refuse to merge, because A already has all the commits that are in B. (Merge commits don't count for that purpose.)

> this is unexpected since now "first parent of e" and "first parent of f" are different based on who you ask

Right, and this is very fundamental to how bzr works: the order of parents depends on the branch where you look at a merge commit. This is bzr's branch-centric nature clearly showing.


to post comments


Copyright © 2026, Eklektix, Inc.
Comments and public postings are copyrighted by their creators.
Linux is a registered trademark of Linus Torvalds