From owner-cvs-src@FreeBSD.ORG Thu Nov 30 17:43:13 2006 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7273516A508; Thu, 30 Nov 2006 17:43:13 +0000 (UTC) (envelope-from ru@rambler-co.ru) Received: from relay0.rambler.ru (relay0.rambler.ru [81.19.66.187]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F16B43CA5; Thu, 30 Nov 2006 17:43:03 +0000 (GMT) (envelope-from ru@rambler-co.ru) Received: from relay0.rambler.ru (localhost [127.0.0.1]) by relay0.rambler.ru (Postfix) with ESMTP id 25A97676D; Thu, 30 Nov 2006 20:43:11 +0300 (MSK) Received: from edoofus.park.rambler.ru (unknown [81.19.65.108]) by relay0.rambler.ru (Postfix) with ESMTP id 05B8F6764; Thu, 30 Nov 2006 20:43:11 +0300 (MSK) Received: (from ru@localhost) by edoofus.park.rambler.ru (8.13.8/8.13.8) id kAUHhDjq011291; Thu, 30 Nov 2006 20:43:13 +0300 (MSK) (envelope-from ru) Date: Thu, 30 Nov 2006 20:43:12 +0300 From: Ruslan Ermilov To: Florent Thoumie Message-ID: <20061130174312.GD75179@rambler-co.ru> References: <200611292024.kATKOviH078532@repoman.freebsd.org> <20061129234157.GN42090@wantadilla.lemis.com> <20061130123712.GV32700@FreeBSD.org> <20061130131421.GA74988@rambler-co.ru> <456F0C2A.80603@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="doKZ0ri6bHmN2Q5y" Content-Disposition: inline In-Reply-To: <456F0C2A.80603@FreeBSD.org> User-Agent: Mutt/1.5.13 (2006-08-11) X-Virus-Scanned: No virus found Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: Man pages .Dd 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, 30 Nov 2006 17:43:13 -0000 --doKZ0ri6bHmN2Q5y Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Nov 30, 2006 at 04:51:54PM +0000, Florent Thoumie wrote: > Ruslan Ermilov wrote: > > On Thu, Nov 30, 2006 at 03:37:12PM +0300, Gleb Smirnoff wrote: [...] > >> Also, when change is merged the .Dd is left from the original > >> commit to HEAD, not the date of the MFC. > >> > > This is true (most of the time ;-). >=20 > Is it true and right? >=20 > Cause I'm always changing .Dd to the date of the MFC. >=20 When MFC is effectively a "copying of changes from branch to branch", you're not changing a document but are "copying" it, so the date should also be copied verbatim. It *sometimes* happens to commit manpage changes that aren't simply copies; for example, you need to implement and document something differently. In this case, the date should be updated and not simply copied. There are more "complicated" cases like the below one, but fortunately they are VERY rare: - A manpage in HEAD gets changes 1 and 2 on December 1 and 2, respectively. - On January 1st, you decide to MFC a change #2; the MFCed version should have "December 2". - On January 2nd, you decide to also MFC a change #1; the MFCed manpage's date should NOT be updated -- it would have to be "updated" to December 1 but the date should not go backwards unless it's a bugfix or reversal. It's easier to think of it as: what would be it if I merged #1 and #2 in their chronological order? Or, in the SCM world: how would I resolve conflicts in this case (yes, you'd get conflicts if you attempt to do it this way). Probably the latter is part of the reason people tend to forget updating the date, I dunno. :-) Cheers, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --doKZ0ri6bHmN2Q5y Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (FreeBSD) iD8DBQFFbxgwqRfpzJluFF4RAm7sAJ91fQL76MUp3jvc9cxklwOktkPPCACbBMks I1nNjDDFppXhQ/l5KwIER3U= =Odyy -----END PGP SIGNATURE----- --doKZ0ri6bHmN2Q5y--