From owner-cvs-src@FreeBSD.ORG Thu Apr 6 08:26:39 2006 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B010116A401; Thu, 6 Apr 2006 08:26:39 +0000 (UTC) (envelope-from pjd@garage.freebsd.pl) Received: from mail.garage.freebsd.pl (arm132.internetdsl.tpnet.pl [83.17.198.132]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA59E43D79; Thu, 6 Apr 2006 08:26:24 +0000 (GMT) (envelope-from pjd@garage.freebsd.pl) Received: by mail.garage.freebsd.pl (Postfix, from userid 65534) id 3D9B752165; Thu, 6 Apr 2006 10:26:23 +0200 (CEST) Received: from localhost (pjd.wheel.pl [10.0.1.1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.garage.freebsd.pl (Postfix) with ESMTP id 599BF51995; Thu, 6 Apr 2006 10:26:16 +0200 (CEST) Date: Thu, 6 Apr 2006 10:25:16 +0200 From: Pawel Jakub Dawidek To: Robert Watson Message-ID: <20060406082516.GB5578@garage.freebsd.pl> References: <200604052212.k35MCTje066272@repoman.freebsd.org> <20060406091224.K53552@fledge.watson.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="i0/AhcQY5QxfSsSZ" Content-Disposition: inline In-Reply-To: <20060406091224.K53552@fledge.watson.org> X-PGP-Key-URL: http://people.freebsd.org/~pjd/pjd.asc X-OS: FreeBSD 7.0-CURRENT i386 User-Agent: mutt-ng/devel-r535 (FreeBSD) X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on mail.garage.freebsd.pl X-Spam-Level: X-Spam-Status: No, score=-5.9 required=3.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.0.4 Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/geom/eli g_eli.c src/sys/geom/gate g_gate.c g_gate.h src/sys/geom/mirror g_mirror.c src/sys/geom/nop g_nop.c src/sys/geom/raid3 g_raid3.c src/sys/geom/shsec g_shsec.c g_shsec.h src/sys/geom/stripe g_stripe.c g_stripe.h ... X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Apr 2006 08:26:39 -0000 --i0/AhcQY5QxfSsSZ Content-Type: text/plain; charset=iso-8859-2 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Apr 06, 2006 at 09:14:10AM +0100, Robert Watson wrote: +> On Wed, 5 Apr 2006, Pawel Jakub Dawidek wrote: +>=20 +> > Modified files: (Branch: RELENG_6) +> > sys/geom/eli g_eli.c +> > sys/geom/gate g_gate.c g_gate.h +> > sys/geom/mirror g_mirror.c +> > sys/geom/nop g_nop.c +> > sys/geom/raid3 g_raid3.c +> > sys/geom/shsec g_shsec.c g_shsec.h +> > sys/geom/stripe g_stripe.c g_stripe.h +> > sys/geom/zero g_zero.c +> > Log: +> > Sync with HEAD. +>=20 +> When synchronizing a branch to another branch, it's helpful to include r= evision information, so that when reviewing a branch log later, it's possib= le to easily determine=20 +> which revisions were merged and when, and easily answer questions like "= Was revision X merged?". Generally I like also including the commit messag= es or a summary so that=20 +> it's easy to tell what feature changes or fixes are going back, but the = revision numbers are sufficient to recreate that moderately easily. I include revision in most cases, but something (like here) its a bit pita. When I commit with "sync with HEAD" commit log, I mean, the code is exactly the same at this point in time in both branches, so one knows that all revisions are merged. --=20 Pawel Jakub Dawidek http://www.wheel.pl pjd@FreeBSD.org http://www.FreeBSD.org FreeBSD committer Am I Evil? Yes, I Am! --i0/AhcQY5QxfSsSZ Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (FreeBSD) iD8DBQFENNBsForvXbEpPzQRAniAAJsFsvQ6do8tvv7pDwz0TgkowK8EkgCg3AVG CY1zsyfo2qZHMPPpPr1YNS0= =5qBP -----END PGP SIGNATURE----- --i0/AhcQY5QxfSsSZ--