From owner-p4-projects@FreeBSD.ORG  Wed Dec 26 10:17:12 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A192816A419; Wed, 26 Dec 2007 10:17:12 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0C6B816A469
	for <perforce@freebsd.org>; Wed, 26 Dec 2007 10:17:12 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 081FD13C46B
	for <perforce@freebsd.org>; Wed, 26 Dec 2007 10:17:12 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBQAHBN5063086
	for <perforce@freebsd.org>; Wed, 26 Dec 2007 10:17:11 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBQAHBWe063083
	for perforce@freebsd.org; Wed, 26 Dec 2007 10:17:11 GMT
	(envelope-from peter@freebsd.org)
Date: Wed, 26 Dec 2007 10:17:11 GMT
Message-Id: <200712261017.lBQAHBWe063083@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 131672 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Dec 2007 10:17:12 -0000

http://perforce.freebsd.org/chv.cgi?CH=131672

Change 131672 by peter@peter_overcee on 2007/12/26 10:16:55

	checkpoint hack for $FreeBSD$.

Affected files ...

.. //depot/projects/hammer/contrib/subversion/subversion/libsvn_subr/subst.c#2 edit

Differences ...

==== //depot/projects/hammer/contrib/subversion/subversion/libsvn_subr/subst.c#2 (text+ko) ====

@@ -374,6 +374,16 @@
   for (i = 0; i < keyword_tokens->nelts; ++i)
     {
       const char *keyword = APR_ARRAY_IDX(keyword_tokens, i, const char *);
+      const char *replaced_word = keyword;
+
+      apr_array_header_t *keyword_tokens2;
+      keyword_tokens2 = svn_cstring_split(keyword, "=", TRUE /* chop */, pool);
+
+      if (keyword_tokens2->nelts==2)
+        {
+          keyword = APR_ARRAY_IDX(keyword_tokens2, 1, const char*);
+          replaced_word = APR_ARRAY_IDX(keyword_tokens2, 0, const char*);
+        }
 
       if ((! strcmp(keyword, SVN_KEYWORD_REVISION_LONG))
           || (! strcmp(keyword, SVN_KEYWORD_REVISION_MEDIUM))
@@ -428,7 +438,7 @@
 
           id_val = keyword_printf("%b %r %d %a", rev, url, date, author,
                                   pool);
-          apr_hash_set(*kw, SVN_KEYWORD_ID,
+          apr_hash_set(*kw, replaced_word,
                        APR_HASH_KEY_STRING, id_val);
         }
     }