-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Log:
Include COMMITTED and PREVIOUS also as invalid revision keywords for a
url diff.
* subversion/libsvn_client/diff.c
(svn_client_diff_peg5): Check also for the COMMITTED and PREVIOUS
revision keywords to error out as invalid diff for a url and also make
error message compliant with that of the one in `svn merge'. Refer:
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=2417716
Patch by: Kannan R <[email protected]>
- --
Thanks & Regards,
Kannan
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iQEVAwUBSw0Di3lTqcY7ytmIAQLohwgAiOt7HgEq4wq2sWu2+gABx571ujVX+/Ex
JiJR5SmzNLLISyCbaNsmmgtrgwS2nS5yE+AKZsnm4mop/U8zNaVF75pMshE6+ZC/
C5kp2Y9P8to/EFqzwVIKlqsdHHJiDWCSjWoCx4xH4MFkE0bFKwUnnj0TvohLyXiD
a5oGjINgB25LksGYvltgy/UCk7jK3A7YzpoMFbmRwslAQ+CdpO/WxtNwM+Yg3MSe
QsBS1nPF6qZSZ9EuvJ4CsSJ2GNcffa06bUvhSeybUIudGjf3MrpWqvHhuMqcrY0H
l1iZdb5m93rSA5rXI5Uhy+aGRonaaApV16lLHD1PoSGw4QoCkBQn4g==
=T+nM
-----END PGP SIGNATURE-----
Index: subversion/libsvn_client/diff.c
===================================================================
--- subversion/libsvn_client/diff.c (revision 883322)
+++ subversion/libsvn_client/diff.c (working copy)
@@ -1764,10 +1764,14 @@
if (svn_path_is_url(path) &&
(start_revision->kind == svn_opt_revision_base
- || end_revision->kind == svn_opt_revision_base) )
- return svn_error_create(SVN_ERR_CLIENT_BAD_REVISION, NULL,
- _("Revision type requires a working copy "
- "path, not a URL"));
+ || end_revision->kind == svn_opt_revision_base
+ || start_revision->kind == svn_opt_revision_committed
+ || end_revision->kind == svn_opt_revision_committed
+ || start_revision->kind == svn_opt_revision_previous
+ || end_revision->kind == svn_opt_revision_previous) )
+ return svn_error_create(
+ SVN_ERR_CLIENT_BAD_REVISION, NULL,
+ _("PREV, BASE, or COMMITTED revision keywords are invalid for URL"));
/* fill diff_param */
diff_params.path1 = path;
