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

Re: svn commit: r27280 - in trunk/subversion: libsvn_client tests/cmdline

From: Blair Zajac <blair_at_orcaware.com>
Date: 2007-10-18 20:51:05 CEST

pburba@tigris.org wrote:
> Author: pburba
> Date: Thu Oct 18 11:00:27 2007
> New Revision: 27280
>
> Log:
> Fix issue #2883 (Effectively reverts r26895 too).
>
> Way back in the day (3 weeks ago) it looked like we could live without
> keeping track of working mergeinfo during what might ultimately be a no-op
> merge. But as the reopened issue #2883 demonstrated, there are edge cases
> where this is still necessary.
>
> * subversion/libsvn_client/merge.c
> (merge_cmd_baton): Add new member override_set.
> (get_mergeinfo_walk_cb,
> insert_parent_and_siblings_of_switched_or_absent_entry,
> get_mergeinfo_paths): Revert r26895, store working propvals in
> svn_client__merge_path_t's stored in children_with_mergeinfo array.
> get_mergeinfo_paths() also sets the new override_set flag if any overrides
> are done -- the comments for get_mergeinfo_paths() go into detail regarding
> what these overrides are and why they are needed.
> (discover_and_merge_children): Remove any mergeinfo overrides done by
> get_mergeinfo_paths() if this is a no-op merge - effectively doing the job
> of cleanup_noop_merge that was reverted in r26836.

There's a compiler warning I get in this function now:

/bin/sh /home/rdiff-backups/blair/svn/svn-trunk/libtool --tag=CC --silent
--mode=compile gcc -DLINUX=2 -D_REENTRANT -D_XOPEN_SOURCE=500 -D_BSD_SOURCE
-D_SVID_SOURCE -D_GNU_SOURCE -g -Wall -pipe -I/usr/include/xmltok
-I/usr/include/openssl -Wall -g -pthread -D_LARGEFILE64_SOURCE -DNE_LFS -std=c89
-Wpointer-arith -Wwrite-strings -Wshadow -DSVN_DEBUG -DAP_DEBUG
-I./subversion/include -I./subversion -I/usr/include/neon -I/usr/include/apr-0
  -I/usr/include/apr-0 -I/usr/include -o subversion/libsvn_client/merge.lo -c
subversion/libsvn_client/merge.c
subversion/libsvn_client/merge.c: In function 'discover_and_merge_children':
subversion/libsvn_client/merge.c:3801: warning: declaration of 'i' shadows a
previous local

Looks like it's safe to remove the

int i;

line, but I'll let you double check :)

Regards,
Blair

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 18 20:51:40 2007

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