Date: Thu, 6 Apr 2006 10:25:16 +0200 From: Pawel Jakub Dawidek <pjd@FreeBSD.org> To: Robert Watson <rwatson@FreeBSD.org> 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 ... Message-ID: <20060406082516.GB5578@garage.freebsd.pl> In-Reply-To: <20060406091224.K53552@fledge.watson.org> References: <200604052212.k35MCTje066272@repoman.freebsd.org> <20060406091224.K53552@fledge.watson.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Thu, Apr 06, 2006 at 09:14:10AM +0100, Robert Watson wrote: +> On Wed, 5 Apr 2006, Pawel Jakub Dawidek wrote: +> +> > 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. +> +> When synchronizing a branch to another branch, it's helpful to include revision information, so that when reviewing a branch log later, it's possible to easily determine +> which revisions were merged and when, and easily answer questions like "Was revision X merged?". Generally I like also including the commit messages or a summary so that +> 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. -- Pawel Jakub Dawidek http://www.wheel.pl pjd@FreeBSD.org http://www.FreeBSD.org FreeBSD committer Am I Evil? Yes, I Am! [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (FreeBSD) iD8DBQFENNBsForvXbEpPzQRAniAAJsFsvQ6do8tvv7pDwz0TgkowK8EkgCg3AVG CY1zsyfo2qZHMPPpPr1YNS0= =5qBP -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060406082516.GB5578>