From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Juanma Barranquero <lekktu@gmail.com>
Cc: emacs-devel@gnu.org
Subject: Re: [Emacs-diffs] /srv/bzr/emacs/emacs-23 r99988: * lisp/subr.el (read-key): Don't hide the menu-bar entries.
Date: Thu, 19 Aug 2010 23:47:40 +0200 [thread overview]
Message-ID: <jwv4oeqxons.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <AANLkTinLLtEa4jMNtCzyY3jYoaDS407ra0xoCe6PBw_V@mail.gmail.com> (Juanma Barranquero's message of "Thu, 19 Aug 2010 20:34:39 +0200")
>> === modified file '.bzrignore'
>> --- a/.bzrignore 2010-08-04 18:04:29 +0000
>> +++ b/.bzrignore 2010-08-19 14:37:31 +0000
>> @@ -69,3 +69,4 @@
>> core
>> lib-src/stamp-*
>> +*
>> +lisp/vc
> Was this on purpose? (It makes sense on emacs-23, but shouldn't be
> merged back into trunk and isn't related to the other changes.)
Yes, it was on purpose (it's done to avoid problems when using "bzr
switch" between trunk and emacs-23). But I just noticed that this only
solves one half of the problem and that the other half isn't so easy
to solve. Bzr just doesn't handle such situations well enough (it
refuses the re-appropriate the lisp/vc directory when I switch back to
trunk, so I get a conflict between the old lisp/vc and the new one).
Stefan
prev parent reply other threads:[~2010-08-19 21:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <E1Om6x4-0005ub-N3@internal.in.savannah.gnu.org>
2010-08-19 18:34 ` [Emacs-diffs] /srv/bzr/emacs/emacs-23 r99988: * lisp/subr.el (read-key): Don't hide the menu-bar entries Juanma Barranquero
2010-08-19 21:47 ` Stefan Monnier [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=jwv4oeqxons.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=emacs-devel@gnu.org \
--cc=lekktu@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 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.