Date: Mon, 7 Jan 2008 12:56:54 +0300 (MSK) From: Dmitry Morozovsky <marck@rinet.ru> To: Peter Wemm <peter@freebsd.org> Cc: cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/contrib/cvs/src parseinfo.c Message-ID: <20080107125523.K55592@woozle.rinet.ru> In-Reply-To: <200801070747.m077lLvK031681@repoman.freebsd.org> References: <200801070747.m077lLvK031681@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] Dear Peter, On Mon, 7 Jan 2008, Peter Wemm wrote: PW> peter 2008-01-07 07:47:21 UTC PW> PW> FreeBSD src repository PW> PW> Modified files: PW> contrib/cvs/src parseinfo.c PW> Log: PW> Add a forward compatability hook so that current cvs can recognize future PW> CVSROOT/config file options that control keyword expansion. cvs-1.12 has PW> its own $Id$ expansion controls and they're configured in CVSROOT/config PW> rather than CVSROOT/options. The problem is that current cvs-1.11.x PW> doesn't understand the future keywords..... PW> PW> Add trivial forward support for the new keywords for when cvs-1.12 PW> hits the tree down the road. CVSROOT/options won't be going away - cvsup PW> uses it. As you finally touch the beast [tm], would you please consider fixing long-standed bug (see attachment) I reported to CVSHome long ago? Thank you in advance. Sincerely, D.Marck [DM5020, MCK-RIPE, DM3-RIPN] [ FreeBSD committer: marck@FreeBSD.org ] ------------------------------------------------------------------------ *** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- marck@rinet.ru *** ------------------------------------------------------------------------ [-- Attachment #2 --] # $Id: FreeBSD/Patches/marck/cvs-update-entries.patch,v 1.2 2004/10/29 06:58:53 marck Exp $ # #-DSC-# fix for misplaced Entries.Log with ``cvs update -d'' See CVS issue #212, https://ccvs.cvshome.org/issues/show_bug.cgi?id=212 Index: update.c =================================================================== RCS file: /home/ncvs/src/contrib/cvs/src/update.c,v retrieving revision 1.6.2.6 diff -u -r1.6.2.6 update.c --- contrib/cvs/src/update.c 21 Jan 2003 22:26:46 -0000 1.6.2.6 +++ contrib/cvs/src/update.c 17 Oct 2004 08:41:09 -0000 @@ -951,6 +951,7 @@ } else { + char *b; /* otherwise, create the dir and appropriate adm files */ /* If no tag or date were specified on the command line, @@ -981,7 +982,16 @@ pull_template); rewrite_tag = 1; nonbranch = 0; - Subdir_Register (entries, (char *) NULL, dir); + + b = strrchr (dir, '/'); + if (b == NULL) + Subdir_Register (entries, (char *) NULL, dir); + else + { + *b = '\0'; + Subdir_Register (entries, dir, b + 1); + *b = '/'; + } } } /* Do we need to check noexec here? */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080107125523.K55592>