diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-03 14:41:30 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-03 14:41:30 -0800 |
| commit | 37ad855a38786722833d06dfe78786acc7e9f412 (patch) | |
| tree | de0f0c7aac92eb2c321c1d6ec3254250316d1035 /admin/notes | |
| parent | 36a50f38fbbcf5cc0cafc44af9d1bfcd6c13fc25 (diff) | |
| parent | f1601063f29c99be77d2513320ed6d2494926c1d (diff) | |
| download | emacs-37ad855a38786722833d06dfe78786acc7e9f412.tar.gz | |
Merge from origin/emacs-24
f160106 Avoid assertion violations in Rmail due to newline cache
1b0ebbd browse-url-firefox: update for firefox 36's removal of -remote
1817892 Avoid erratic behavior of menu-bar tooltips on w32 (Bug#19925)
0260932 Bump python.el version
b0adfc7 Spelling fixes
35f047c * src/fileio.c (Fmake_temp_name): Doc tweaks.
6f2971a * lisp/comint.el (comint-line-beginning-position): Revert searching
65d8ac7 Mention in admin/notes/repo how to mark commits not to be merged.
86fe750 # Remove NEWS temporary markup
4fa778b erc.el: Add old version header for package.el compatibilty
9366f05 Tramp: Disable paging with PAGER=cat
Conflicts:
admin/notes/repo
etc/NEWS
lisp/ChangeLog
lisp/erc/ChangeLog
src/ChangeLog
Diffstat (limited to 'admin/notes')
| -rw-r--r-- | admin/notes/repo | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/admin/notes/repo b/admin/notes/repo index 2d4cc2a55cf..4f9dc59eb0f 100644 --- a/admin/notes/repo +++ b/admin/notes/repo @@ -7,6 +7,27 @@ package archive (elpa.gnu.org). See admin/notes/elpa for further explanation, and the README file in the branch for usage instructions. +* Install changes only on one branch, let them get merged elsewhere if needed. + +In particular, install bug-fixes only on the release branch (if there +is one) and let them get synced to the trunk; do not install them by +hand on the trunk as well. E.g. if there is an active "emacs-24" branch +and you have a bug-fix appropriate for the next emacs-24.x release, +install it only on the emacs-24 branch, not on the trunk as well. + +Installing things manually into more than one branch makes merges more +difficult. + +http://lists.gnu.org/archive/html/emacs-devel/2010-03/msg01124.html + +The exception is, if you know that the change will be difficult to +merge to the trunk (eg because the trunk code has changed a lot). +In that case, it's helpful if you can apply the change to both trunk +and branch yourself (when committing the branch change, indicate +in the commit log that it should not be merged to the trunk, by +including the phrase "Not to be merged to master", or any other phrase +that matches "merge"). + * Installing changes from your personal branches. If your branch has only a single commit, or many different real |