emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Obscure error/warning/information message from git pull


From: Sergey Organov
Subject: Re: Obscure error/warning/information message from git pull
Date: Wed, 19 Nov 2014 19:39:24 +0300
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux)

Eli Zaretskii <address@hidden> writes:

>> Date: Wed, 19 Nov 2014 08:12:38 +0700
>> From: Yuri Khan <address@hidden>
>> Cc: Sergey Organov <address@hidden>, Emacs developers <address@hidden>
>> 
>> On Wed, Nov 19, 2014 at 4:43 AM, Alan Mackenzie <address@hidden> wrote:
>> >
>> >> Well, given the following history (time goes from left to right):
>> >
>> >>              - C - D <- foo
>> >>            /
>> >> ... - A - B
>> >>            \
>> >>              - E - F <- bar
>> >
>> >
>> >> what branch commit A was made on, 'foo' or 'bar'?
>> >
>> > Quite clearly, A was committed on branch foo, since bar didn't exist at
>> > that time.
>> 
>> But git does not know that. For all it knows, bar could be the
>> original branch and foo branched from it at B. The history above is
>> symmetrical.
>
> Bringing DAG rewriting into the picture doesn't help a bit in this
> already messy discussion.  Nothing like that happened in Alan's case,
> and the chances of its happening in the Emacs repo are slim at best.

You still don't get it. No DAG rewriting and we still get to this
history while A was made on "branch bar", see my other post.

-- 
Sergey.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]