From: Eli Zaretskii <eliz@gnu.org>
To: Lars Magne Ingebrigtsen <larsi@gnus.org>
Cc: 19049@debbugs.gnu.org
Subject: bug#19049: 25.0.50; emacs-repository-get-version doesn't work with git
Date: Fri, 14 Nov 2014 16:47:26 +0200 [thread overview]
Message-ID: <83fvdlj0u9.fsf@gnu.org> (raw)
In-Reply-To: <m3d28pub0t.fsf@stories.gnus.org>
> From: Lars Magne Ingebrigtsen <larsi@gnus.org>
> Cc: 19049@debbugs.gnu.org
> Date: Fri, 14 Nov 2014 15:12:02 +0100
>
> Eli Zaretskii <eliz@gnu.org> writes:
>
> > To the wrong branch again. Please backport this to the emacs-24
> > branch.
>
> I would if I knew how.
Just commit the same changes to the branch and mention "backported" in
the commit message.
> admin/repo says
>
> ----
>
> * Backporting a bug-fix from the trunk to a branch (e.g. "emacs-24").
>
> Indicate in the commit log that there is no need to merge the commit
> to the trunk, e.g. start the commit message with "Backport:". This is
> helpful for the person merging the release branch to the trunk.
>
> http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00262.html
>
> * How to merge changes from emacs-24 to trunk
>
> [The section on git merge procedure has not yet been written]
>
> ----
>
> neither of which helps, and the Emacs for Git Devs wiki doesn't say how
> to cherry-pick stuff, either.
Where were you 10 months ago, when I wrote that this is what will
happen, if the instructions are left at what was written back then?
If some of those who are mightily confused now, as I predicted they
will be, supported what I said back then, perhaps we could have had
enough leverage to insist on better write-ups. But nooo! everyone who
cared to reply claimed that this is all either obvious or too personal
to describe, and some even said I'm a "bullshitter".
Now you-all get to learn this stuff the hard way.
next prev parent reply other threads:[~2014-11-14 14:47 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-13 22:44 bug#19049: 25.0.50; emacs-repository-get-version doesn't work with git Ulrich Mueller
2014-11-14 4:01 ` Lars Magne Ingebrigtsen
2014-11-14 4:06 ` Lars Magne Ingebrigtsen
2014-11-14 7:19 ` Ulrich Mueller
2014-11-14 7:39 ` Eli Zaretskii
2014-11-14 8:07 ` Ulrich Mueller
2014-11-14 6:24 ` Eli Zaretskii
2014-11-14 14:12 ` Lars Magne Ingebrigtsen
2014-11-14 14:17 ` Dmitry Gutov
2014-11-14 14:22 ` Lars Magne Ingebrigtsen
2014-11-14 14:25 ` Lars Magne Ingebrigtsen
2014-11-14 14:37 ` Dmitry Gutov
2014-11-14 14:41 ` Lars Magne Ingebrigtsen
2014-11-14 14:52 ` Eli Zaretskii
2014-11-14 14:58 ` Dmitry Gutov
2014-11-14 15:06 ` Eli Zaretskii
2014-11-14 14:52 ` Eli Zaretskii
2014-11-14 14:50 ` Eli Zaretskii
2014-11-14 14:47 ` Eli Zaretskii [this message]
2014-11-14 14:59 ` Lars Magne Ingebrigtsen
2014-11-14 15:11 ` Eli Zaretskii
2014-11-14 15:16 ` Lars Magne Ingebrigtsen
2014-11-14 15:23 ` Eli Zaretskii
2014-11-14 15:26 ` Eli Zaretskii
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83fvdlj0u9.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=19049@debbugs.gnu.org \
--cc=larsi@gnus.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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).