[Emacs-diffs] Changes to emacs/admin/notes/bugtracker,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/07/01 07:09:03

Index: bugtracker
===================================================================
RCS file: /sources/emacs/emacs/admin/notes/bugtracker,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- bugtracker  1 Jul 2008 06:56:26 -0000       1.12
+++ bugtracker  1 Jul 2008 07:09:03 -0000       1.13
@@ -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: address@hidden
   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: address@hidden
+  forcemerge 123 124 125 ...
+
 ** To set severity:
 
   To: address@hidden