From owner-freebsd-doc@FreeBSD.ORG Fri Apr 8 10:30:12 2011 Return-Path: Delivered-To: freebsd-doc@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D6AA31065679 for ; Fri, 8 Apr 2011 10:30:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 98F508FC14 for ; Fri, 8 Apr 2011 10:30:12 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p38AUCIf053587 for ; Fri, 8 Apr 2011 10:30:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p38AUCop053586; Fri, 8 Apr 2011 10:30:12 GMT (envelope-from gnats) Resent-Date: Fri, 8 Apr 2011 10:30:12 GMT Resent-Message-Id: <201104081030.p38AUCop053586@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-doc@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Fedor Dikarev Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8FCB11065670 for ; 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 ; 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 ; 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 To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: docs/156271: mergemaster doesn't support -a and -i flags together X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Apr 2011 10:30:12 -0000 >Number: 156271 >Category: docs >Synopsis: mergemaster doesn't support -a and -i flags together >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-doc >State: open >Quarter: >Keywords: >Date-Required: >Class: doc-bug >Submitter-Id: current-users >Arrival-Date: Fri Apr 08 10:30:12 UTC 2011 >Closed-Date: >Last-Modified: >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: >Unformatted: