[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: VC mode and git
From: |
Eli Zaretskii |
Subject: |
Re: VC mode and git |
Date: |
Sun, 05 Apr 2015 20:50:49 +0300 |
> From: "Stephen J. Turnbull" <address@hidden>
> Cc: address@hidden,
> address@hidden
> Date: Mon, 06 Apr 2015 02:36:37 +0900
>
> > > If the previous pull succeeded, does this mean that he lost a
> > > race in a handful of minutes? And lost "a lot" of text? Weird.
> >
> > One possibility is a merge from emacs-24, which can potentially bring
> > quite a few commits from the release branch, and is done by a program,
> > so it can be very fast. Look at the long list of the modified files
> > that are staged, which the pull succeeded to merge -- they do suggest
> > a lot of changes were fetched.
>
> You think Richard pulled from emacs-24?
No, I think someone else merged from emacs-24 onto master, and pushed
the result between Richard's 2 pulls.
> > Saving a file after resolving all of its conflicts automatically
> > runs "git add" for that file in Emacs's VC, so it is already
> > staged.
> >
> > So yes, "git commit" should have worked.
>
> OK. If vc does that, I don't understand the intended workflow in vc,
> then. Maybe it's just adapted to what ESR does.
I think VC's support of the intended workflow "needs work" (TM).
- Re: VC mode and git, (continued)
- Re: VC mode and git, Stephen J. Turnbull, 2015/04/04
- Re: VC mode and git, Stephen J. Turnbull, 2015/04/04
- Re: VC mode and git, Eli Zaretskii, 2015/04/05
- Re: VC mode and git, Stephen J. Turnbull, 2015/04/05
- Re: VC mode and git, Eli Zaretskii, 2015/04/05
- Re: VC mode and git, Stephen J. Turnbull, 2015/04/05
- Re: VC mode and git,
Eli Zaretskii <=
- Re: VC mode and git, Richard Stallman, 2015/04/05
- Re: VC mode and git, Eli Zaretskii, 2015/04/05
- Re: VC mode and git, Harald Hanche-Olsen, 2015/04/05
- Re: VC mode and git, Eli Zaretskii, 2015/04/05
- Re: VC mode and git, Harald Hanche-Olsen, 2015/04/05
- Re: VC mode and git, Harald Hanche-Olsen, 2015/04/04
- Re: VC mode and git, Stephen J. Turnbull, 2015/04/04
- Re: VC mode and git, Lele Gaifax, 2015/04/04
- Re: VC mode and git, Stephen J. Turnbull, 2015/04/04
- Re: VC mode and git, Lele Gaifax, 2015/04/05