[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Emacs-diffs] /srv/bzr/emacs/emacs-23 r99988: * lisp/subr.el (read-k
From: |
Stefan Monnier |
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 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) |
>> === 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