[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Obscure error/warning/information message from git pull
From: |
Eli Zaretskii |
Subject: |
Re: Obscure error/warning/information message from git pull |
Date: |
Wed, 19 Nov 2014 18:18:17 +0200 |
> 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.
- Re: Obscure error/warning/information message from git pull, (continued)
- Re: Obscure error/warning/information message from git pull, Eli Zaretskii, 2014/11/18
- Re: Obscure error/warning/information message from git pull, Sergey Organov, 2014/11/18
- Re: Obscure error/warning/information message from git pull, Eli Zaretskii, 2014/11/18
- Re: Obscure error/warning/information message from git pull, David Kastrup, 2014/11/18
- Re: Obscure error/warning/information message from git pull, Eli Zaretskii, 2014/11/18
- Re: Obscure error/warning/information message from git pull, Sergey Organov, 2014/11/18
- Re: Obscure error/warning/information message from git pull, Alan Mackenzie, 2014/11/18
- Re: Obscure error/warning/information message from git pull, Barry Warsaw, 2014/11/18
- Re: Obscure error/warning/information message from git pull, David Kastrup, 2014/11/19
- Re: Obscure error/warning/information message from git pull, Yuri Khan, 2014/11/18
- Re: Obscure error/warning/information message from git pull,
Eli Zaretskii <=
- Re: Obscure error/warning/information message from git pull, Yuri Khan, 2014/11/19
- Re: Obscure error/warning/information message from git pull, Sergey Organov, 2014/11/19
- Re: Obscure error/warning/information message from git pull, Teemu Likonen, 2014/11/18
- Re: Obscure error/warning/information message from git pull, Stephen J. Turnbull, 2014/11/19
- Re: Obscure error/warning/information message from git pull, Teemu Likonen, 2014/11/19
- Re: Obscure error/warning/information message from git pull, Thien-Thi Nguyen, 2014/11/19
- Re: Obscure error/warning/information message from git pull, Achim Gratz, 2014/11/19
- Re: Obscure error/warning/information message from git pull, Alan Mackenzie, 2014/11/19
- Re: Obscure error/warning/information message from git pull, David Kastrup, 2014/11/19
- Re: Obscure error/warning/information message from git pull, Sergey Organov, 2014/11/19