[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Emacs repository benchmark: bzr and git
From: |
Stefan Monnier |
Subject: |
Re: Emacs repository benchmark: bzr and git |
Date: |
Sat, 29 Mar 2008 00:50:00 -0400 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) |
> I *think* it's actually one or more trees. The first tree is the
> left hand parent. Any other tress are the state in the other
> parents, i.e. merged revisions.
I don't think so. The "second tree" seems to correspond to the
leftmost parent. The first tree seems to correspond to something else.
It's usually the same as the second, but when I did a merge, the first
tree seems to describe something like the state of tree at the end of
the merge command, and it dosn't have sha1 for the files with conflicts
(and maybe for others as well).
When merging, there are more than 2 trees (typically just 3: the
"current", the "second" (i.e. leftmost parent), and some other which
I guess corresponds to the other parent).
Stefan
- Re: Emacs repository benchmark: bzr and git, (continued)
- Re: Emacs repository benchmark: bzr and git, Richard Stallman, 2008/03/18
- Re: Emacs repository benchmark: bzr and git, Jonathan Lange, 2008/03/26
- Re: Emacs repository benchmark: bzr and git, Stephen J. Turnbull, 2008/03/26
- Re: Emacs repository benchmark: bzr and git, Stefan Monnier, 2008/03/26
- Re: Emacs repository benchmark: bzr and git, dhruva, 2008/03/27
- Re: Emacs repository benchmark: bzr and git, Vincent Ladeuil, 2008/03/27
- Re: Emacs repository benchmark: bzr and git, Stefan Monnier, 2008/03/28
- Re: Emacs repository benchmark: bzr and git, James Westby, 2008/03/28
- Re: Emacs repository benchmark: bzr and git, Stefan Monnier, 2008/03/28
- Re: Emacs repository benchmark: bzr and git, James Westby, 2008/03/29
- Re: Emacs repository benchmark: bzr and git,
Stefan Monnier <=
- Re: Emacs repository benchmark: bzr and git, Xavier Maillard, 2008/03/28
- Re: Emacs repository benchmark: bzr and git, David Cournapeau, 2008/03/29
- Re: Emacs repository benchmark: bzr and git, Xavier Maillard, 2008/03/30
- Re: Emacs repository benchmark: bzr and git, Xavier Maillard, 2008/03/28
- Re: Emacs repository benchmark: bzr and git, Andreas Schwab, 2008/03/29
- Re: Emacs repository benchmark: bzr and git, David Kastrup, 2008/03/29
- Re: Emacs repository benchmark: bzr and git, dhruva, 2008/03/29
- Re: Emacs repository benchmark: bzr and git, David Kastrup, 2008/03/29
- Re: Emacs repository benchmark: bzr and git, Xavier Maillard, 2008/03/30
- Re: Emacs repository benchmark: bzr and git, Randal L. Schwartz, 2008/03/29