[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Marge from emacs-24
|
From: |
Stefan Monnier |
|
Subject: |
Re: Marge from emacs-24 |
|
Date: |
Fri, 21 Sep 2012 09:07:59 -0400 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.2.50 (gnu/linux) |
>> > A couple of critical bugfixes were committed to the emacs-24 branch
>> > lately, but the last merge from there was almost 3 weeks ago. Can it
>> > be merged again, please?
>> Done.
> Thanks.
BTW, normally anyone can do such a merge. Basically, you should be able
to do something like:
M-x load-file RET .../admin/bzrmerge RET
M-x cd RET .../trunk RET
M-x bzrmerge RET .../emacs-24 RET
... hopefully everything works ...
... take-a look-at-the result and when everything looks good ...
bzr commit -m 'Merge from emacs-24'
Stefan