all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: Achim Gratz <Stromeko@nexgo.de>
Cc: emacs-devel@gnu.org
Subject: Re: git commit/push and VC
Date: Thu, 20 Nov 2014 22:59:07 +0200	[thread overview]
Message-ID: <83fvdd612c.fsf@gnu.org> (raw)
In-Reply-To: <87ppchd9dk.fsf@Gertrud.fritz.box>

> From: Achim Gratz <Stromeko@nexgo.de>
> Date: Thu, 20 Nov 2014 19:17:43 +0100

Thanks for your comments.  A few responses below.

> >   . do we want to explicitly recommend 2 different clones, one each
> >     for master and the release branch? there's nothing in the
> >     instructions about this, or about working with 2 divergent
> >     branches in general
> 
> I've just got a new computer and it takes all of 0.6 seconds to switch
> from master to emacs-24.  I've had a much slower one until two days ago
> and I don't think it took longer than about 5 seconds even there.

You are missing the point.  Switching the branch is easy, but after
that, you'd almost always need a full bootstrap, which might become
annoying.

> Unless you're really working all the time in parallel on both branches
> I'd say this setup is more trouble than it's worth.

I personally am working on both branches in parallel, yes.  Many
others do, too.  Bugfixes go to one branch, new features to the other,
people report bugs on this or other, etc.  Bootstrapping each time,
which takes a couple of minutes, is annoying.  And then you sometimes
want to compare what the two binaries, one from master, the other from
the release branch, do in the same situation.

But that's me, and I already know how to solve this.  I'm asking what,
if anything, do we want to recommend.

> >   . GitQuickStartForEmacsDevs advises to use "git ci -a"; why not
> >     suggest the same in GitForEmacsDevs? it seems a simpler setup
> 
> That is no git command.  Assuming that ci is an alias for commit, then
> no, that is not a good recommendation in general.  If the only changes
> you have belong to a single commit (a quick bugfix, say) then it saves a
> bit of typing.  But if the changes should really be goign to different
> commits for clarity, then this is ill-advised.

We are talking about simplified instructions here, mind you.  Don't
take that as a general advice for advanced users: they don't need
these instructions.



  reply	other threads:[~2014-11-20 20:59 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-19 23:36 git commit/push and VC Stephen Berman
2014-11-20  2:07 ` Glenn Morris
2014-11-20 12:28   ` Stephen Berman
2014-11-20  3:29 ` Yuri Khan
2014-11-20 15:45   ` Eli Zaretskii
2014-11-20 18:17     ` Achim Gratz
2014-11-20 20:59       ` Eli Zaretskii [this message]
2014-11-21  0:31         ` Stephen J. Turnbull
2014-11-21  9:01           ` Eli Zaretskii
2014-11-22  5:30             ` Stephen J. Turnbull
2014-11-22  5:50               ` Yuri Khan
2014-11-22  7:17                 ` Stephen J. Turnbull
2014-11-22  6:50               ` Ivan Shmakov
2014-11-22  7:25                 ` Stephen J. Turnbull
2014-11-22  7:42                   ` Ivan Shmakov
2014-11-22  8:59                     ` Stephen J. Turnbull
2014-11-22  8:36                 ` Eli Zaretskii
2014-11-22  8:37                 ` Andreas Schwab
2014-11-22  8:50                   ` Ivan Shmakov
2014-11-22  8:35               ` Eli Zaretskii
2014-11-22  9:36                 ` Stephen J. Turnbull
2014-11-22 10:25                   ` Eli Zaretskii
2014-11-22 11:31                     ` Andreas Schwab
2014-11-22 12:37                       ` Eli Zaretskii
2014-11-22 13:00                         ` Andreas Schwab
2014-11-22 13:45                           ` Eli Zaretskii
2014-11-22 14:12                             ` Andreas Schwab
2014-11-22 15:20                               ` Eli Zaretskii
2014-11-21  8:23         ` martin rudalics
2014-11-21  9:06           ` Eli Zaretskii
2014-11-21  9:40             ` Dani Moncayo
2014-11-21 10:24             ` martin rudalics
2014-11-21 10:40               ` Eli Zaretskii
2014-11-21  8:49         ` Thien-Thi Nguyen
2014-11-21  9:12           ` Eli Zaretskii
2014-11-22 10:30       ` Eli Zaretskii
2014-11-22 10:43         ` David Kastrup
2014-11-22 11:01           ` Eli Zaretskii
2014-11-22 11:16             ` Eli Zaretskii
2014-11-22 11:22               ` David Kastrup
2014-11-21 10:34     ` Stephen Berman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=83fvdd612c.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=Stromeko@nexgo.de \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.