VCS comparison table
Vincent Ladeuil
v.ladeuil at alplog.fr
Thu Oct 26 13:33:32 BST 2006
>>>>> "Jeff" == Jeff King <peff at peff.net> writes:
Jeff> On Thu, Oct 26, 2006 at 12:52:05PM +0200, Vincent Ladeuil wrote:
>> Ok, so git make a distinction between the commit (code created by
>> someone) and the tree (code only).
Jeff> Yes (a commit is a tree, zero or more parents, commit message, and
Jeff> author/committer info).
The parents of a tree are also trees or can/must they be commits ?
>> Commits are defined by their parents.
Jeff> Partially, yes.
I buy that this "partially" means "the other parts are irrelevant
to this discussion".
>> Trees are defined by their content only ?
Jeff> Yes.
So it is possible that : starting from a tree T,
- I make a patch A,
- you make the patch B,
- A and B are equal (stop watching above my shoulder please, or what is me ?),
- we both commit,
- we pull changes from each other repository.
We will end up with a tree T2 with a hash corresponding to both
T+A and T+B, but each of us will have a different commit id CA
and CB both pointing to T2, did I get it ?
Vincent
More information about the bazaar
mailing list