From owner-cvs-src@FreeBSD.ORG Wed Apr 2 12:05:53 2003 Return-Path: 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 A3BF737B401; Wed, 2 Apr 2003 12:05:53 -0800 (PST) Received: from cirb503493.alcatel.com.au (c18609.belrs1.nsw.optusnet.com.au [210.49.80.204]) by mx1.FreeBSD.org (Postfix) with ESMTP id BD19C43F93; Wed, 2 Apr 2003 12:05:51 -0800 (PST) (envelope-from peterjeremy@optushome.com.au) Received: from cirb503493.alcatel.com.au (localhost.alcatel.com.au [127.0.0.1])h32K5nM2031832; Thu, 3 Apr 2003 06:05:49 +1000 (EST) (envelope-from jeremyp@cirb503493.alcatel.com.au) Received: (from jeremyp@localhost) by cirb503493.alcatel.com.au (8.12.8/8.12.8/Submit) id h32K5kjb031831; Thu, 3 Apr 2003 06:05:47 +1000 (EST) From: Peter Jeremy Date: Thu, 3 Apr 2003 06:05:46 +1000 To: Stephen McKay Message-ID: <20030402200546.GA31752@cirb503493.alcatel.com.au> References: <200304010821.h318Li4Q091687@repoman.freebsd.org> <20030401114055.M1612@odysseus.silby.com> <200304021447.h32ElHYH008677@dungeon.home> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200304021447.h32ElHYH008677@dungeon.home> User-Agent: Mutt/1.4.1i gFrom: Peter Jeremy cc: cvs-src@freebsd.org cc: Mike Silbersack cc: src-committers@freebsd.org cc: cvs-all@freebsd.org Subject: Re: cvs commit: src/sbin/ping ping.8 ping.c src/share/man/man4 inet.4 ip.4 src/sys/netinet in.h in_pcb.h ip.h ip_input.c ip_output.c ip_var.h src/usr.bin/netstat inet.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 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: Wed, 02 Apr 2003 20:05:54 -0000 On Thu, Apr 03, 2003 at 12:47:17AM +1000, Stephen McKay wrote: >On Tuesday, 1st April 2003, Mike Silbersack wrote: >>> Implement support for RFC 3514 (The Security Flag in the IPv4 Header). >>> (See: ftp://ftp.rfc-editor.org/in-notes/rfc3514.txt) >> >>Actually committing to the tree is taking this joke quite a bit too far. >>Is repo-surgery planned to remove this? > >Can we have this invisibly un-commited? If you mean "make it so it never happened" then I don't believe this is possible. To explain, the change means that ping.c (for example) has gone from rev 1.91 to rev 1.92 - and this change has been fairly widely disseminated: Lots of people will have CVSup'd it and it's in the CTM history. If it "never happened" then ping.c will revert to rev 1.91 (etc). Firstly, I believe CVS doesn't cope well with this sort of thing. Secondly, the next person to commit to ping.c will create rev 1.92 - meaning that there are two different rev 1.92 versions in existence. Whatever happens, the "undo" has to increment the CVS revisions. This can most easily be done either by mdodd@ reverting his change normally. If necessary, cvs@ could then perform some surgery to mean that ping.c 1.92 doesn't exist (though this will cause pain for anyone who has 1.92 checked out). IMHO, this joke isn't so off-colour that it has to disappear from the repository. I agree that this joke has probably outlived its purpose but a normal backout should be sufficient for this. Peter