From: joaotavora@gmail.com (João Távora)
To: Stefan Monnier <monnier@IRO.UMontreal.CA>
Cc: 16981-done@debbugs.gnu.org, 17192-done@debbugs.gnu.org,
17183-done@debbugs.gnu.org, Alan Mackenzie <acm@muc.de>
Subject: bug#16981: 24.3.50; electric-pair-delete-adjacent-pairs broken in c-mode, python-mode, maybe-others
Date: Mon, 07 Apr 2014 01:04:35 +0100 [thread overview]
Message-ID: <87zjjyovho.fsf@kitaj.lan> (raw)
In-Reply-To: <jwvfvlqljfm.fsf-monnier+emacsbugs@gnu.org> (Stefan Monnier's message of "Sun, 06 Apr 2014 08:48:21 -0400")
Stefan Monnier <monnier@IRO.UMontreal.CA> writes:
> Just take the corresponding diffs (IIRC you can use
> "bzr merge -r116925..r116926 .../trunk" for that) and commit them into
> emacs-24.
>
> Bzr doesn't really know about cherry picking, but if you put
> "backported" into your commit message, our bzrmerge.el script
> will know that this commit is already in the trunk and will know how to
> avoid the corresponding conflicts when merging emacs-24 back into trunk.
>
>> - Three different fixes (bugs 16981,17192 and 17183) not yet pushed that
>> I think you want me to only push to emacs-24, since that will be merged
>> back to trunk later.
>
> Right.
These three I did successfully, but failed miserably in the
backporting. Oh git where art thou... Now I'm downloading a new repo
(with sharing properly setup hopefully), since I must have done
something that messed up my bzr conf, apparently I shouldn't have moved
my repo dir.
Should be done tomorrow morning, so I'll backport r116926 and r116940
then.
prev parent reply other threads:[~2014-04-07 0:04 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <mailman.16921.1394480964.10748.bug-gnu-emacs@gnu.org>
2014-03-10 19:47 ` bug#16981: 24.3.50; electric-pair-delete-adjacent-pairs broken in c-mode, python-mode, maybe-others João Távora
2014-03-13 22:04 ` Alan Mackenzie
2014-03-18 1:56 ` bug#16959: " Stefan
2014-03-20 0:33 ` Florian Beck
2014-03-21 21:47 ` Stefan
2014-03-25 17:38 ` Florian Beck
2014-03-26 0:34 ` Stefan Monnier
2014-04-05 11:58 ` João Távora
2014-04-05 15:45 ` Stefan Monnier
2014-04-06 1:51 ` João Távora
2014-04-06 12:48 ` Stefan Monnier
2014-04-06 15:08 ` João Távora
2014-04-07 0:04 ` João Távora [this message]
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=87zjjyovho.fsf@kitaj.lan \
--to=joaotavora@gmail.com \
--cc=16981-done@debbugs.gnu.org \
--cc=17183-done@debbugs.gnu.org \
--cc=17192-done@debbugs.gnu.org \
--cc=acm@muc.de \
--cc=monnier@IRO.UMontreal.CA \
/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.