* Re: [Emacs-diffs] /srv/bzr/emacs/emacs-23 r99988: * lisp/subr.el (read-key): Don't hide the menu-bar entries.
[not found] <E1Om6x4-0005ub-N3@internal.in.savannah.gnu.org>
@ 2010-08-19 18:34 ` Juanma Barranquero
2010-08-19 21:47 ` Stefan Monnier
0 siblings, 1 reply; 2+ messages in thread
From: Juanma Barranquero @ 2010-08-19 18:34 UTC (permalink / raw)
To: Stefan Monnier; +Cc: emacs-devel
On Thu, Aug 19, 2010 at 16:37, Stefan Monnier <monnier@iro.umontreal.ca> wrote:
> === 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.)
Juanma
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [Emacs-diffs] /srv/bzr/emacs/emacs-23 r99988: * lisp/subr.el (read-key): Don't hide the menu-bar entries.
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
0 siblings, 0 replies; 2+ messages in thread
From: Stefan Monnier @ 2010-08-19 21:47 UTC (permalink / raw)
To: Juanma Barranquero; +Cc: emacs-devel
>> === 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-08-19 21:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[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
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.