[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: Kannan <kannanr_at_collab.net>
Date: Thu, 15 Oct 2009 18:38:27 +0530

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Kannan wrote:
>
> 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.
>
> * 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.
>
> Patch by : Kannan R <kannanr_at_collab.net>
>
>

Corrected a typo in the patch.
s/got_conflicts/got_conflict/

- --
Regards,
Kannan
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEVAwUBStcey3lTqcY7ytmIAQKPBwf8CWq/yhfR5+LibK5NojGwknFtgtpnBxss
rBD5Ucw0THmn4iVOr1werExztpWrYi/bfiP8UGPPQUwJrvmBUM7T44VKvPnomCe9
IAQSvVQv/xSVkaP8sNDgH3eWaBcHecE7sDnMtW4k2CZi5/zJSzPstQejKvImncE8
UuabPSGrr+2+29uxhOKNvpCzJ5MkiAL9PU/lCInhNtToffYQIND9CGFkhBGYhvZy
PJHoyGiaCIlhu6Fv4hfuvpr/Ys23/v3SzD6wZ4o+/Ny0pviy5tbE8sWVgrlwppjH
25Q/YsMHBoAw3zFgMZ8GKQgJK/y34QHpxso6ZsCKU+VGZmOtZVJcgA==
=jGmF
-----END PGP SIGNATURE-----

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2407882

Received on 2009-10-15 15:10:58 CEST

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