From owner-cvs-src@FreeBSD.ORG Thu Oct 21 22:02:23 2004 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 5C57316A4CE; Thu, 21 Oct 2004 22:02:23 +0000 (GMT) Received: from tigra.ip.net.ua (tigra.ip.net.ua [82.193.96.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6672743D5E; Thu, 21 Oct 2004 22:02:22 +0000 (GMT) (envelope-from ru@ip.net.ua) Received: from localhost (rocky.ip.net.ua [82.193.96.2]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id i9LM2KhJ008379; Fri, 22 Oct 2004 01:02:20 +0300 (EEST) (envelope-from ru@ip.net.ua) Received: from tigra.ip.net.ua ([82.193.96.10]) by localhost (rocky.ipnet [82.193.96.2]) (amavisd-new, port 10024) with LMTP id 18809-15; Fri, 22 Oct 2004 01:02:19 +0300 (EEST) Received: from heffalump.ip.net.ua (heffalump.ip.net.ua [82.193.96.213]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id i9LM2CXN008374; Fri, 22 Oct 2004 01:02:15 +0300 (EEST) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by heffalump.ip.net.ua (8.13.1/8.13.1) id i9LM1pBZ044511; Fri, 22 Oct 2004 01:01:51 +0300 (EEST) (envelope-from ru) Date: Fri, 22 Oct 2004 01:01:50 +0300 From: Ruslan Ermilov To: Peter Wemm Message-ID: <20041021220150.GB67066@ip.net.ua> References: <200410212002.i9LK22mI064024@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="yNb1oOkm5a9FJOVX" Content-Disposition: inline In-Reply-To: <200410212002.i9LK22mI064024@repoman.freebsd.org> User-Agent: Mutt/1.5.6i X-Virus-Scanned: by amavisd-new at ip.net.ua cc: cvs-src@freebsd.org cc: src-committers@freebsd.org cc: cvs-all@freebsd.org Subject: Re: cvs commit: src/contrib/libreadline complete.c rlconf.h shell.c terminal.c src/contrib/libreadline/doc readline.3 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: Thu, 21 Oct 2004 22:02:23 -0000 --yNb1oOkm5a9FJOVX Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Peter, On Thu, Oct 21, 2004 at 08:02:02PM +0000, Peter Wemm wrote: > peter 2004-10-21 20:02:02 UTC >=20 > FreeBSD src repository >=20 > Modified files: > contrib/libreadline complete.c rlconf.h shell.c terminal.c=20 > contrib/libreadline/doc readline.3=20 > Log: > Force these files back off the vendor branch. They should NEVER have b= een > put back on there in the first place. :-( > =20 > Note that complete.c will need a readline 5.0 merge. > =20 > Revision Changes Path > 1.10 +238 -51 src/contrib/libreadline/complete.c > 1.9 +23 -7 src/contrib/libreadline/doc/readline.3 > 1.6 +1 -0 src/contrib/libreadline/rlconf.h > 1.8 +5 -0 src/contrib/libreadline/shell.c > 1.6 +8 -11 src/contrib/libreadline/terminal.c >=20 So why it was a problem putting these files back on their vendor branch? Do you have an insight why CVSup didn't reset the branch for some people? Cheers, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --yNb1oOkm5a9FJOVX Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (FreeBSD) iD8DBQFBeDHOqRfpzJluFF4RArJDAJ9Fho5/383k2HWkEmCo+p4OTZETVgCcDLjQ 9vqhv/UgpDs8WkEn1NZCnKU= =K/Ka -----END PGP SIGNATURE----- --yNb1oOkm5a9FJOVX--