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

Re: [PATCH] [Modified]Restrict interactive callback for prop conflicts in `svn merge --dry-run'

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Fri, 16 Oct 2009 11:33:45 +0100

Kannan wrote:
> Julian Foad wrote:
> > Can I recommend passing the 'dry_run' flag through to
> > maybe_generate_propconflict(), and doing the "if (dry_run) then it's a
> > conflict" there in just one place. That will make it easier to extend
> > when we want to make it possible for the "accept=theirs" options to act
> > properly in dry-run mode.
> >
> > - Julian
>
> Log:
> When in `--dry-run' mode of `svn merge' command, property conflicts
> make an interactive callback to the user to resolve the conflicts,
> unlike the text conflicts. The following patch restricts the interactive
> callback in `--dry-run' mode.

s/restricts/suppresses/

+1 to this version of the patch. I'll commit it.

> * subversion/libsvn_wc/props.c
> (svn_wc__merge_props) : Pass `dry_run' parameter to the required
> methods.
> (apply_single_prop_add, apply_single_prop_delete,
> apply_single_prop_change, apply_single_generic_prop_change,
> apply_single_mergeinfo_prop_change) : Pass `dry_run' to
> `maybe_generate_propconflict'
> (maybe_generate_propconflict) : Check for `--dry-run' mode and set the
> boolean `conflict_remains', instead of invoking the interactive
> callback.
>
> Patch by : Kannan R <kannanr_at_collab.net>
>
> Suggested by : julianf

I only suggested a slightly different way of implementing it, not the
whole idea!

Committed in r40072.

Thanks!
- Julian

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2408182
Received on 2009-10-16 12:34:09 CEST

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