Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 Mar 2011 02:03:31 +0000 (UTC)
From:      Dan Mahoney <dmahoney@isc.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/155567: Patch to add -r tag:date to CVS
Message-ID:  <20110315020331.9685158C7CF@repo.isc.org>
Resent-Message-ID: <201103150210.p2F2ACRo017372@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         155567
>Category:       ports
>Synopsis:       Patch to add -r tag:date to CVS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 15 02:10:12 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Dan Mahoney
>Release:        FreeBSD 8.0-RELEASE-p3 amd64
>Organization:
ISC
>Environment:
System: FreeBSD repo.isc.org 8.0-RELEASE-p3 FreeBSD 8.0-RELEASE-p3 #0: Tue May 25 20:54:11 UTC 2010 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64


>Description:

Apple's cvs version supports '-r tag:date' which allows you
to specify a date on a branch and is version 1.12.13.

FreeBSD's cvs is 1.11.22.1-20080310-FreeBSD (1.11 vs 1.12)
and it doesn't support '-r tag:date'.

The attached patch is against 1.11.23 and adds support for
'-r tag:date'. It's base on the following but is just the
minimal changes required to add support. It splits the
revision string.

Note that the mainline CVS doesn't appear to have been updated in a while, so it makes more sense to submit at an OS level than 
upstream.

>How-To-Repeat:

See above.  This is an enhancement to bring the mainline tool in line with apple's mods.

>Fix:

The attached (small) patch will add this, was written here at ISC:

--- src/patch.c	2005-09-23 02:03:04.000000000 +0000
+++ src/patch.c	2011-01-27 03:50:27.000000000 +0000
@@ -119,10 +119,10 @@
 		if (rev2 != NULL || date2 != NULL)
 		    error (1, 0,
 		       "no more than two revisions/dates can be specified");
-		if (rev1 != NULL || date1 != NULL)
-		    rev2 = optarg;
+		if (rev1 || date1)
+		    parse_tagdate (&rev2, &date2, optarg);
 		else
-		    rev1 = optarg;
+		    parse_tagdate (&rev1, &date1, optarg);
 		break;
 	    case 'k':
 		if (options)


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110315020331.9685158C7CF>