diff options
author | Glenn Morris <rgm@gnu.org> | 2011-04-25 21:50:33 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2011-04-25 21:50:33 -0700 |
commit | 87e400b4c75a9c5673c95e7b5bb598b6556a0711 (patch) | |
tree | 181647b8dc66368e8146d3b309fce21d64ee55a9 /admin/notes | |
parent | c27d48cac8c6e2b0a9f46d6db4d419c84d93a916 (diff) | |
download | emacs-87e400b4c75a9c5673c95e7b5bb598b6556a0711.tar.gz |
* admin/notes/bzr: Small updates.
Diffstat (limited to 'admin/notes')
-rw-r--r-- | admin/notes/bzr | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/admin/notes/bzr b/admin/notes/bzr index 5600c9badb0..f4907063d0b 100644 --- a/admin/notes/bzr +++ b/admin/notes/bzr @@ -12,10 +12,17 @@ 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; see below). + * Backporting a bug-fix from the trunk to a branch (e.g. "emacs-23"). -Label the commit as a backport, e.g. by starting the commit message with -"Backport:". This is helpful for the person merging the release branch -to the trunk. +Indicate in the commit log that there is no need to merge the commit +to the trunk. Anything that matches `bzrmerge-skip-regexp' will do; +eg start the commit message with "Backport:". This is helpful for the +person merging the release branch to the trunk. http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00262.html |