[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Emacs Bazaar repository
From: |
Stephen J. Turnbull |
Subject: |
Re: Emacs Bazaar repository |
Date: |
Sat, 15 Mar 2008 09:39:52 +0900 |
James Westby writes:
> May I point you to my blog post of yesterday that explains some of
> these issues, rather than spell if all out here?
>
> http://jameswestby.net/weblog/bzr/01-revision-numbers.html
>
> The last section is on this particular issue.
>
> The gist of it is that topological sorting means that children appear
> before their parents. bzr does "merge sorting" that ensures that a
> revision does not appear after a revision that it is not an ancestor
> of.
Excuse me? There may be something sensible you wish to say, but what
I have quoted is not it. If A and B are not ordered by ancestry both
"AB" and "BA" fail to be a "merge sort" according to that criterion.
>From the blog:
Always having merge commits means that "bzr log --short" and "bzr
log --line" can give you a good summary of what happened on your
branch, the commits you did, and the things that you merged. It
preserves a mainline for you in the left hand ancestry,
git-show-branch does this satisfactorily for me, although admittedly
more recent unmerged commits on other branches may show up first.
This is a *good* thing if I'm thinking about merging them, though.
OTOH, gitk simply prunes any unmerged commits by default. How does
"merge sort" differ from "topological sort pruning unmerged commits"?
AFAICT in that case "not an ancestor" == "is a descendant" so topo
sort and merge sort are the same. What am I missing?
The indentation of the merged commits (and the fact they disappear
with "--short" and "--line") means that mentally they become of
lesser importance.
But that's exactly what I rarely want. I know what I did, unless it
was a long time ago. What I generally want to know is what others are
doing, and how that impacts my branch when I merge their code.
> While we may be able to offer some UI improvements to git itself there
> may be fundamental differences that mean git may always fall short of
> what we would like. There are also things that bzr can do that git
> will never do (barring any big changes in direction), for instance
> foreign branch support.
What is "foreign branch support", and why do you think that a program
which is amounts to being a browser for the universal revision graph
can't do it? An URL would do.
- Re: Emacs Bazaar repository, (continued)
- Re: Emacs Bazaar repository, David Allouche, 2008/03/14
- Re: Emacs Bazaar repository, James Westby, 2008/03/14
- Re: Emacs Bazaar repository, David Kastrup, 2008/03/14
- Re: Emacs Bazaar repository, James Westby, 2008/03/14
- Re: Emacs Bazaar repository, David Kastrup, 2008/03/14
- Re: Emacs Bazaar repository, James Westby, 2008/03/14
- Re: Emacs Bazaar repository,
Stephen J. Turnbull <=
- Re: Emacs Bazaar repository, James Westby, 2008/03/15
- Re: Emacs Bazaar repository, James Westby, 2008/03/15
- Re: Emacs Bazaar repository, Nicholas Allen, 2008/03/14
- Re: Emacs Bazaar repository, Stephen J. Turnbull, 2008/03/14
- Re: Emacs Bazaar repository, Matthieu Moy, 2008/03/17
- Re: Emacs Bazaar repository, Sergei Organov, 2008/03/17
- Re: Emacs Bazaar repository, Dan Nicolaescu, 2008/03/17
- Re: Emacs Bazaar repository, dhruva, 2008/03/17
- Re: Emacs Bazaar repository, Karl Fogel, 2008/03/18
- Re: Emacs Bazaar repository, dhruva, 2008/03/18