From owner-freebsd-stable@FreeBSD.ORG Fri Jul 3 09:28:26 2009 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 29D6F1065670 for ; Fri, 3 Jul 2009 09:28:26 +0000 (UTC) (envelope-from dan.naumov@gmail.com) Received: from mail-gx0-f210.google.com (mail-gx0-f210.google.com [209.85.217.210]) by mx1.freebsd.org (Postfix) with ESMTP id DB4B38FC12 for ; Fri, 3 Jul 2009 09:28:25 +0000 (UTC) (envelope-from dan.naumov@gmail.com) Received: by gxk6 with SMTP id 6so1944023gxk.19 for ; Fri, 03 Jul 2009 02:28:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=yfmuMJSUpbk9Ts1ESwyqQrIEcghCqwR5ez1dilindPM=; b=IMnQhDOf0+6fYT0CpeBtW3SBuYwq85IMQkkyVoHPBA0/h98UZb8tW1kcYKeI0jef8j DUBAjUqFEDS+CouAUKxyY3kVb4789FhTM3twp9YBVsK1clqPmSB9LjWwtSoELKcEBfJr IWg+sslf6AUJrWYZnxoyvD8aKMTDVdIXX8CRQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=LQsgJdXM3RTooNLL6KO9TDIMv3wWEtMihiwQSB6by1n3qtMhyJUa64MLsBQIfP6XvQ CgnqQGFkpKt/a/tW8+Oe9adVCVJwJsTgmg620chgIBcU+n2Dy9yEprlxsl0m7tSnN2g4 rsMh9neF4mKAOYHUiBemZ3Dl+pyicYNzkahYQ= MIME-Version: 1.0 Received: by 10.100.177.15 with SMTP id z15mr1904170ane.27.1246613304983; Fri, 03 Jul 2009 02:28:24 -0700 (PDT) In-Reply-To: <4A4DC67C.3010804@bsdforen.de> References: <4A4DC67C.3010804@bsdforen.de> Date: Fri, 3 Jul 2009 12:28:24 +0300 Message-ID: From: Dan Naumov To: Dominic Fandrey Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: freebsd-stable@freebsd.org Subject: Re: mergemaster merge left/right X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jul 2009 09:28:26 -0000 Speaking of mergemaster, it would be really really nice to have "freebsd-update install" get the following functionality/options from mergemaster: -i Automatically install any files that do not exist in the destination directory. -F If the files differ only by VCS Id ($FreeBSD) install the new file. This would help avoid having to manually approve installation of hundreds of files in /etc when you upgrade to new releases using freebsd-update. - Sincerely, Dan Naumov On Fri, Jul 3, 2009 at 11:51 AM, Dominic Fandrey wrote: > I'd really like mergemaster to tell me whether the left > or the right side is the new file. > > # $FreeBSD: src/etc/devd.conf,v 1.38. | # $FreeBSD: src/etc/devd.conf,v 1.38. > > Like this I have no idea which one to pick. > _______________________________________________ > freebsd-stable@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-stable > To unsubscribe, send any mail to "freebsd-stable-unsubscribe@freebsd.org" >