Re: VC mode and git

[Sergey Organov]

Eli Zaretskii <address@hidden> writes:

>> From: Sergey Organov <address@hidden>
>> Date: Thu, 02 Apr 2015 20:02:02 +0300
>> 
>> >> > A merge does much more than just commit.  At least AFAIU.
>> >> 
>> >> Dunno what you have in mind.
>> >
>> > The changes to meta-data that reflect the changes in the history DAG.
>> 
>> No meta-data outside of the commit, AFAIK.
>> 
>> Each commit has zero or more pointers to parents, usually 1. Merge
>> commit is commit that has more pointers to parents than 1 (usually 2).
>> That's all about the meta-data. Simple, eh?
>
> And that meta-data needs to be brought in as part of the merge, in
> addition to changes to the tree.
>
> You can call all of this a "commit", but then you probably mean
> "commit object", a different beast.  Using confusing shorts in this
> discussion doesn't help understanding.

OK, let me try to be more precise then.

No matter if you perform commit operation or merge operation, similar
DAG meta-information is stored into the commit object by Git: the list
of references to the ancestors of this commit object.

If you did not mean that storing 2 references instead of 1 into the
commit object is doing "much more than just commit", then what did you
mean? What changes to what meta-data? Reflecting what changes in the
history DAG?

-- Sergey.