From owner-freebsd-questions Tue Oct 16 21:34:25 2001 Delivered-To: freebsd-questions@freebsd.org Received: from pemaquid.safeport.com (pemaquid.safeport.com [204.156.12.58]) by hub.freebsd.org (Postfix) with ESMTP id 9D0DF37B401 for ; Tue, 16 Oct 2001 21:34:20 -0700 (PDT) Received: from localhost (doug@localhost) by pemaquid.safeport.com (8.11.5/8.11.1) with ESMTP id f9H4YJs40846 for ; Wed, 17 Oct 2001 00:34:19 -0400 (EDT) (envelope-from doug@safeport.com) X-Authentication-Warning: pemaquid.safeport.com: doug owned process doing -bs Date: Wed, 17 Oct 2001 00:34:19 -0400 (EDT) From: To: freebsd-questions@FreeBSD.ORG Subject: Re: mergemaster -- whats the best way? Message-ID: MIME-Version: 1.0 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 I have not tried the -s option I will read and try that the next time. I find that the longer you go between builds, the more files running: mergemaster -ai leaves. Mostly these files can be recognized because they have the same date. I have attached the script I wrote to do this. Typically mergemaster leaves about 100 files. Using this script I can get about 75% of them. The method is: run it with no operands and you get the documentation which basically says: 1) mergemaster -ai 2) ./mm_update.sh -l - At this point you will se a bunch of files that mergemaster left behind. They will mostly have the same date. If they are okay to replace.. 3) ./mm_update -r -d date - must be quoted to match ls output 4) mergemaster -r - to handle what really needs to be merged or replaced. On Wed, 17 Oct 2001, Cyrille Lefevre wrote: > 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 _____ Douglas Denault doug@safeport.com Voice: 301-469-8766 Fax: 301-469-0601 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message