From nobody@FreeBSD.org  Fri Apr  8 10:22:25 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8FCB11065670
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  8 Apr 2011 10:22:25 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 7ED658FC12
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  8 Apr 2011 10:22:25 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p38AMPCA080585
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 8 Apr 2011 10:22:25 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p38AMPEC080584;
	Fri, 8 Apr 2011 10:22:25 GMT
	(envelope-from nobody)
Message-Id: <201104081022.p38AMPEC080584@red.freebsd.org>
Date: Fri, 8 Apr 2011 10:22:25 GMT
From: Fedor Dikarev <fedor.dikarev@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: mergemaster doesn't support -a and -i flags together
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         156271
>Category:       docs
>Synopsis:       mergemaster(8) doesn't support -a and -i flags together
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    dougb
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 08 10:30:12 UTC 2011
>Closed-Date:    Wed Apr 13 19:56:46 UTC 2011
>Last-Modified:  Wed Apr 13 19:56:46 UTC 2011
>Originator:     Fedor Dikarev
>Release:        
>Organization:
>Environment:
>Description:
 I've upgraded kernel on freebsd and have got some problem installing world with mergemaster:

fe:test-backend{R}[20] ~$ head -n 63 /usr/src/Makefile | tail -n 6
# 6. `mergemaster -p'
# 7. `make installworld'
# 8. `make delete-old'
# 9. `mergemaster' (you may wish to use -U or -ai).
# 10. `reboot'
# 11. `make delete-old-libs' (in case no 3rd party program uses them anymore)


If I'm trying -ai options:

fe:test-backend{R}[21] ~$ mergemaster -ai

*** You have included the -a option along with one or more options
that indicate that you wish mergemaster to actually make updates
(-F, -U, or -i), however these options are not compatible.
Please read mergemaster(8) for more information.


And I've checked man 8 mergemaster:

fe:test-backend{R}[22] ~$ man 8 mergemaster

-a Run automatically. This option will leave all the files that
differ from the installed versions in the temporary directory
to be dealt with by hand. If the temproot directory exists,
it creates a new one in a previously non-existent directory.
This option unsets the verbose flag, and is not compatible
with -i, -F, or -U. Setting -a makes -w superfluous.


Should somebody change /usr/src/Makefile accordingly or I've misunderstood something?
>How-To-Repeat:

>Fix:


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-doc->dougb 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Sat Apr 9 20:18:17 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=156271 
State-Changed-From-To: open->patched 
State-Changed-By: dougb 
State-Changed-When: Sun Apr 10 03:53:33 UTC 2011 
State-Changed-Why:  

Patched in HEAD, MFC ASAP. Thanks for letting us know about this. :) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=156271 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/156271: commit references a PR
Date: Sun, 10 Apr 2011 03:53:20 +0000 (UTC)

 Author: dougb
 Date: Sun Apr 10 03:53:06 2011
 New Revision: 220512
 URL: http://svn.freebsd.org/changeset/base/220512
 
 Log:
   Update recommendation for mergemaster. The -a and -i options are exclusive.
   
   PR:		docs/156271
   Submitted by:	Fedor Dikarev <fedor.dikarev@gmail.com>
 
 Modified:
   head/Makefile
 
 Modified: head/Makefile
 ==============================================================================
 --- head/Makefile	Sun Apr 10 03:49:53 2011	(r220511)
 +++ head/Makefile	Sun Apr 10 03:53:06 2011	(r220512)
 @@ -65,7 +65,7 @@
  #  6.  `mergemaster -p'
  #  7.  `make installworld'
  #  8.  `make delete-old'
 -#  9.  `mergemaster'                         (you may wish to use -U or -ai).
 +#  9.  `mergemaster'		(you may wish to use -i, along with -U or -F).
  # 10.  `reboot'
  # 11.  `make delete-old-libs' (in case no 3rd party program uses them anymore)
  #
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: dougb 
State-Changed-When: Wed Apr 13 19:56:18 UTC 2011 
State-Changed-Why:  

MFC to RELENG_[78] is now complete. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=156271 
>Unformatted:
