[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r30467 - trunk/subversion/libsvn_client

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: Thu, 10 Apr 2008 19:49:03 +0530

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

> + SVN_ERR(svn_mergeinfo_to_string(&filtered_mergeinfo_str,
> + filtered_mergeinfo,
> pool));
> adjusted_prop->name = SVN_PROP_MERGEINFO;
> - adjusted_prop->value =
> - svn_string_create(apr_pstrcat(pool, source_path, ":",
> - adjusted_rangelist_s->data,
> - NULL),
> - pool);
> + adjusted_prop->value = filtered_mergeinfo_str;
> APR_ARRAY_PUSH(adjusted_props, svn_prop_t) = *adjusted_prop;
> }
> - } /* mergeinfo hash iteration */

What about 'un-filtered' mergeinfo? Then we are not adding anything to
adjusted_props so may loose un-filtered mergeinfo.

The code(even before this commit) looks buggy in this aspect.
Following patch may fix it.

I am testing the same with custom testcase.

Index: subversion/libsvn_client/merge.c
===================================================================
- --- subversion/libsvn_client/merge.c (revision 30479)
+++ subversion/libsvn_client/merge.c (working copy)
@@ -485,6 +485,8 @@
               adjusted_prop->value = filtered_mergeinfo_str;
               APR_ARRAY_PUSH(adjusted_props, svn_prop_t) = *adjusted_prop;
             }
+ else
+ APR_ARRAY_PUSH(adjusted_props, svn_prop_t) = *prop;

           /* If we reparented MERGE_B->RA_SESSION2 above, put it back
              to the original URL. */

With regards
Kamesh Jayachandran
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFH/iHX3WHvyO0YTCwRAtOhAJ9/s+cbwnv74P4y63okvrMPqjaYbgCfUFA0
00XyzHjV/AzDYvqeU/9eGcs=
=hyj4
-----END PGP SIGNATURE-----

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-04-10 16:19:45 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.