Will re-basing support be added into Bazaar core ?
Ben Finney
ben+bazaar at benfinney.id.au
Tue Apr 21 05:01:30 BST 2009
"Stephen J. Turnbull" <stephen at xemacs.org> writes:
> Ben Finney writes:
>
> > I don't see how that's true. The loom has the crucial difference
> > that none of the existing revisions are altered, nor are their
> > relationships in the history altered.
>
> The same is true of git by construction. New revisions are added, with
> the same semantic content (you hope).
Note that we're specifically talking about rebase, not other Git
operations. As I understand it from your descriptions and others
<URL:http://blog.experimentalworks.net/2009/03/merge-vs-rebase-a-deep-dive-into-the-mysteries-of-revision-control/>,
rebase makes the revisions *not there anymore* in the branch history.
Whether they're still in the repository somewhere isn't relevant to
this point: they're gone *from the branch*.
> Exactly the same is true for loom, right down to the "(you hope)".
That's the significant difference I'm pointing out with a loom:
revisions never go away from the branch, but new ones get added.
> The only difference is the UI by which you refer to the new and/or old
> revisions (ie, how you get them to manifest in a workspace so you can
> build and test them), and how they are represented in the VCS
> database. Git doesn't distinguish between revisions "as they happened"
> and "as they are rebased". Loom does distinguish between "revisions"
> and "threads". Purely UI.
What you call UI in this context, I call the data model. The data model
in rebase is that history, as modelled by the tool and presented to the
user, is altered. With a loom, that's not true.
> Try grokking git instead of accepting the FUD about it.
I'm not sure how you distinguish; this looks perilously close to the
“no true Scotsman” fallacy, where no matter how much I learn, if my
opinions of what I've learned don't meet your expectations I'm still not
considered to have “grokked” it.
Exactly what am I supposed to grok, and what FUD am I currently subject
to?
> You may learn to hate git like a Martian, but you'll stop fearing it.
I've never feared Git; either that, or I don't know what you mean.
--
\ “Pinky, are you pondering what I'm pondering?” “Wuh, I think |
`\ so, Brain, but if we didn't have ears, we'd look like weasels.” |
_o__) —_Pinky and The Brain_ |
Ben Finney
More information about the bazaar
mailing list