-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
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>
- --
Regards,
Kannan
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iQEVAwUBStcZ6XlTqcY7ytmIAQIF+ggAoI4hRMpzU6/SFOXLlt2GvfB41MCi17Zf
xRXBYvCWi9mEB/ojEmt0zX6vVl2jbC3stylzMf6JtTUneSebtZwaPcE+lgXjsni0
QtTXOQwHEqdTameaa2F9ShuNc1RVdtgLX5B3pj+/u9cHeZtLjjmbVBrpFiQiq1Fw
RJ5ua/nWo1aaT+Cp4kXA4MX340qOPQwRFfBM2UMcthUv2jzi3rYbZU7ek7+XV85E
PEIoHCrBVoSnfiIWOYq5O/R6LY1T4wXUKu03XdjBgz7ymCljyHBfsMkmgHUZiL8I
YuS/B0AEclW15nTZWk+Hfk7gxj+EKDdByIckfJwvtO7STYkG/zo/gA==
=Ssom
-----END PGP SIGNATURE-----
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2407878
Received on 2009-10-15 14:49:19 CEST