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

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

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Thu, 15 Oct 2009 14:20:03 +0100

Kannan wrote:
> > 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.
> >
> > * 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) : Check for the `--dry-run' mode
> > and set the boolean `got_conflict', instead of invoking the
> > interactive callback.

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

Received on 2009-10-15 15:20:46 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.