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

Re: How wrong can we get a short doc-string?

From: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 14 Aug 2008 19:37:32 +0200

On Thu, Aug 14, 2008 at 06:02:02PM +0100, Julian Foad wrote:
> For our collective shame ...
> In libsvn_client/merge.c:
> [[[
> > /* Get REVISION of the file at URL. SOURCE is a path that refers to that
> > file's entry in the working copy, or NULL if we don't have one. Return in
> > *FILENAME the name of a file containing the file contents, in *PROPS a hash
> > containing the properties and in *REV the revision. All allocation occurs
> > in POOL. */
> There's no argument named 'REVISION' (it's 'REV').
> There's no argument named 'URL', nor anything that looks like one.
> There's no argument named 'SOURCE', but two possible alternatives.
> There is an argument named 'RA_SESSION' that's not mentioned.
> There is an argument named 'WC_TARGET' that's not mentioned.

Could this possibly have been an auto-merge on update or such
that went wrong? Or did someone pick the wrong docstring by
accident while resolving a conflict or something?

Note that this function used to be in a different file once:

r24045 | lundblad | 2007-03-23 14:57:41 +0100 (Fri, 23 Mar 2007) | 21 lines

Split a file into two.

Suggested by: sanity

* subversion/libsvn_client/diff.c
  (svn_client_diff_summarize_dup): Move to "public APIs' section.
  (ENSURE_VALID_REVISION_KINDS, check_scheme_match,
  svn_client__dry_run_deletions, dry_run_deleted_p, merge_props_changed,
  merge_file_changed, merge_file_added, merge_file_deleted, merge_dir_added,
  merge_delete_notify_baton_t, merge_delete_notify_func, merge_dir_deleted,
  merge_callbacks, get_wc_merge_info, get_wc_and_repos_merge_info,
  calculate_merge_ranges, notification_receiver_baton_t, notification_receiver,
  default_conflict_resolver, determine_merges_performed,
  update_wc_merge_info, merge_type, grok_range_info_from_opt_revisions,
  do_merge, single_file_merge_get_file, do_single_file_merge,
  discover_and_merge_children, svn_client_merge3, svn_client_merge2,
  svn_client_merge, svn_client_merge_peg3, svn_client_merge_peg2,
  svn_client_merge_peg): Move to...

* subversion/libsvn_client/merge.c: ... this new file.


> Bloody hell.

Hey, no need to swear.

> Excuse my language.

Hey, no need to to excuse yourself.


> > static svn_error_t *
> > single_file_merge_get_file(const char **filename,
> > svn_ra_session_t *ra_session,
> > apr_hash_t **props,
> > svn_revnum_t rev,
> > const char *wc_target,
> > apr_pool_t *pool)
> ]]]
> I'll go and figure out what it's supposed to be, as I think I may want to use it.

Good luck digging! Don't forget to take at least 5 health potions,
a sword, and of course a shovel.


To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-08-14 19:37:54 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.