Mercurial > emacs

changeset 96469:40d413a9e07b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Glenn Morris <rgm@gnu.org>
date Tue, 01 Jul 2008 07:09:03 +0000
parents 5c93e68f7620
children 2af6e85f13d5
files admin/notes/bugtracker
diffstat 1 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/admin/notes/bugtracker	Tue Jul 01 06:56:26 2008 +0000
+++ b/admin/notes/bugtracker	Tue Jul 01 07:09:03 2008 +0000
@@ -87,11 +87,18 @@
 
 ** To merge bugs:
 Eg when bad replies create a bunch of new bugs for the same report.
-Bugs must all be in the same state.
+Bugs must all be in the same state, but need not have the same tags.
 
   To: control@emacsbugs.donarmstrong.com
   merge 123 124 125 ...
 
+** Forcing a merge:
+Like `merge', but bugs need not be in the same state.  The first one
+listed is the master.
+
+  To: control@emacsbugs.donarmstrong.com
+  forcemerge 123 124 125 ...
+
 ** To set severity:
 
   To: control@emacsbugs.donarmstrong.com