Emacs Bazaar repository
schwab at suse.de
Fri Mar 14 14:30:21 GMT 2008
Matthieu Moy <Matthieu.Moy at imag.fr> writes:
> As opposed to that, bzr makes the distinction between "mainline
> revisions" (that you commited in the branch), and merged revisions
> (ancestors of merge commits that you brought here with a merge).
Is that a useful distinction? I think git treats all branches equal,
there is no "mainline". If you merge two branches that touch different
parts of the tree there is no need to distinguish the two threads.
> That's a real difference in the way git and bzr deal with the history
> DAG, not just about "log". For example, git merge defaults to
> fast-forward (i.e. if you merge a revision you are a direct ancestor
> of, you just jump to that revision without creating a new commit).
If you just move forward in the history it is not really a merge, so
there should not be a need for creating a marker for it.
Andreas Schwab, SuSE Labs, schwab at suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
More information about the bazaar