unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: Dani Moncayo <dmoncayo@gmail.com>
Cc: 18840@debbugs.gnu.org
Subject: bug#18840: 24.4; nt/README.W32: obsolete snippet
Date: Sun, 26 Oct 2014 20:24:38 +0200	[thread overview]
Message-ID: <83d29e4rkp.fsf@gnu.org> (raw)
In-Reply-To: <CAH8Pv0hNbzsWvOz06EAv53r3tQxwxJ+aYpQ+k=hwfNXuT8WX_A@mail.gmail.com>

> Date: Sun, 26 Oct 2014 19:05:32 +0100
> From: Dani Moncayo <dmoncayo@gmail.com>
> 
> > Committed & closing this bug.
> 
> I've just realized that this should have gone to emacs-24, not the
> trunk.  Sorry.
> 
> (I could back port this to emacs-24 is someone tell me how, or what
> doc to read).

You could simply apply the diffs, it's no big deal in this case.

If you want bzr to do the job for you, then the following will do it:

  cd emacs-24 && bzr merge -r 118218..118219 ../trunk

Then "bzr ci" as usual, but please be sure to say in the commit
message that this was "backported from trunk", so that the next merge
from emacs-24 to the trunk will skip this commit.

Thanks.





  reply	other threads:[~2014-10-26 18:24 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-26  9:47 bug#18840: 24.4; nt/README.W32: obsolete snippet Dani Moncayo
2014-10-26 16:04 ` Eli Zaretskii
2014-10-26 16:49   ` Dani Moncayo
2014-10-26 17:17     ` Eli Zaretskii
2014-10-26 17:55       ` Dani Moncayo
2014-10-26 18:05         ` Dani Moncayo
2014-10-26 18:24           ` Eli Zaretskii [this message]
2014-10-26 18:40             ` Dani Moncayo

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=83d29e4rkp.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=18840@debbugs.gnu.org \
    --cc=dmoncayo@gmail.com \
    /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).