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

[PATCH][merge-tracking]Remove redundant code

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2007-03-14 16:18:50 CET

Hi All,
Find the attached patch and log.

With regards
Kamesh Jayachandran

[[[

Remove redundant code.

* subversion/libsvn_client/diff.c
  (find_wc_merge_info):
    'walk_path' is non empty here. No need to check it again.

Patch by: kameshj
]]]

Index: subversion/libsvn_client/diff.c
===================================================================
--- subversion/libsvn_client/diff.c (revision 23813)
+++ subversion/libsvn_client/diff.c (working copy)
@@ -1867,8 +1867,7 @@
         {
           apr_hash_this(hi, &key, NULL, &val);
           ranges = val;
- path = svn_path_is_empty(walk_path) ?
- key : svn_path_join((const char *) key, walk_path, pool);
+ path = svn_path_join((const char *) key, walk_path, pool);
           apr_hash_set(*mergeinfo, path, APR_HASH_KEY_STRING, ranges);
         }
     }

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Mar 14 16:19:23 2007

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