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

[PATCH] Correct two doc strings and rename a local type for clarity.

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: 2006-03-13 13:14:15 CET

Any problems with this?

- Julian

Correct two doc strings and rename a local type for clarity.

* subversion/include/libsvn_client.h
  (svn_client_diff3): Remove an obsolete restriction from the doc string.
    (Thanks to Malcolm Rowe for noticing.)

* subversion/libsvn_client/diff.c
  (struct diff_repos_repos): Rename to diff_repos_repos_t, to differentiate
    it from the function of the same name.
  (diff_prepare_repos_repos, diff_repos_repos, diff_summarize_repos_repos):
    Adjust uses of that type.
  (svn_client_diff3): Remove an obsolete comment from the doc string.

Index: subversion/include/svn_client.h
===================================================================
--- subversion/include/svn_client.h (revision 18821)
+++ subversion/include/svn_client.h (working copy)
@@ -1346,8 +1346,7 @@
  *
  * @a path1 and @a path2 must both represent the same node kind -- that
  * is, if @a path1 is a directory, @a path2 must also be, and if @a path1
- * is a file, @a path2 must also be. (Currently, @a path1 and @a path2
- * must be the exact same path)
+ * is a file, @a path2 must also be.
  *
  * If @a recurse is true (and the @a paths are directories) this will be a
  * recursive operation.
Index: subversion/libsvn_client/diff.c
===================================================================
--- subversion/libsvn_client/diff.c (revision 18821)
+++ subversion/libsvn_client/diff.c (working copy)
@@ -1477,7 +1477,7 @@ check_paths(const struct diff_parameters
 }
 
 /** Helper structure filled by diff_prepare_repos_repos */
-struct diff_repos_repos
+struct diff_repos_repos_t
 {
   /* URL created from path1 */
   const char *url1;
@@ -1521,7 +1507,7 @@ struct diff_repos_repos
  * structure. */
 static svn_error_t *
 diff_prepare_repos_repos(const struct diff_parameters *params,
- struct diff_repos_repos *drr,
+ struct diff_repos_repos_t *drr,
                          svn_client_ctx_t *ctx,
                          apr_pool_t *pool)
 {
@@ -2010,7 +1996,7 @@ diff_repos_repos(const struct diff_param
   const svn_delta_editor_t *diff_editor;
   void *diff_edit_baton;
 
- struct diff_repos_repos drr;
+ struct diff_repos_repos_t drr;
 
   /* Prepare info for the repos repos diff. */
   SVN_ERR(diff_prepare_repos_repos(diff_param, &drr, ctx, pool));
@@ -2257,7 +2243,7 @@ diff_summarize_repos_repos(const struct
   const svn_delta_editor_t *diff_editor;
   void *diff_edit_baton;
 
- struct diff_repos_repos drr;
+ struct diff_repos_repos_t drr;
 
   /* Prepare info for the repos repos diff. */
   SVN_ERR(diff_prepare_repos_repos(diff_param, &drr, ctx, pool));
@@ -2321,7 +2307,7 @@ do_diff_summarize(const struct diff_para
 /*** Public Interfaces. ***/
 
 /* Display context diffs between two PATH/REVISION pairs. Each of
- these input will be one of the following:
+ these inputs will be one of the following:
 
    - a repository URL at a given revision.
    - a working copy path, ignoring local mods.
@@ -2457,11 +2358,6 @@ do_diff_summarize_peg(const struct diff_
    Svn_client_diff3() is the single entry point for all of the diff
    operations, and will be in charge of examining the inputs and
    making decisions about how to accurately report contextual diffs.
-
- NOTE: In the near future, svn_client_diff3() will likely only
- continue to report textual differences in files. Property diffs
- are important, too, and will need to be supported in some fashion
- so that this code can be re-used for svn_client_merge().
 */
 svn_error_t *
 svn_client_diff3(const apr_array_header_t *options,

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Mar 13 13:14:59 2006

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