From owner-freebsd-questions Tue Oct 16 20:43:30 2001 Delivered-To: freebsd-questions@freebsd.org Received: from smtp.noos.fr (zola.noos.net [212.198.2.76]) by hub.freebsd.org (Postfix) with ESMTP id A1F3F37B403 for ; Tue, 16 Oct 2001 20:43:24 -0700 (PDT) Received: (qmail 5443873 invoked by uid 0); 17 Oct 2001 03:43:22 -0000 Received: from unknown (HELO gits.dyndns.org) ([212.198.231.187]) (envelope-sender ) by 212.198.2.76 (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 17 Oct 2001 03:43:22 -0000 Received: (from root@localhost) by gits.dyndns.org (8.11.6/8.11.6) id f9H0hVc04459; Wed, 17 Oct 2001 02:43:31 +0200 (CEST) (envelope-from root) Message-Id: <200110170043.f9H0hVc04459@gits.dyndns.org> Subject: Re: mergemaster -- whats the best way? In-Reply-To: <001301c15671$6b2effe0$252da818@sioux> To: "Jonathan M. Slivko" Date: Wed, 17 Oct 2001 02:43:31 +0200 (CEST) Cc: freebsd-questions@freebsd.org, freebsd-stable@freebsd.org Reply-To: clefevre@citeweb.net From: Cyrille Lefevre Organization: ACME X-Face: X-Mailer: ELM [version 2.4ME+ PL94c (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Jonathan M. Slivko wrote: > > Whats the best way about going to do a mergemaster without having to read > through every single change, modification, etc. Is there some kind of script > that will automatically merge the changes into the existing files without > much user intervention? (e.g. unattended?) use these both sequences, only manually required changes will be prompted. mergemaster -svia mergemaster -vir # or -svir see the manual pages for details or search the -freebsd mailing lists. Cyrille. -- Cyrille Lefevre mailto:clefevre@citeweb.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message