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

Re: [PATCH] Fix `svn merge' involving revision range and urls

From: Kannan <kannanr_at_collab.net>
Date: Fri, 13 Nov 2009 18:09:04 +0530

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

Paul Burba wrote:
>> Hi Kannan,
>
>> If your merge source is a URL, what exactly do you expect BASE, PREV,
>> and COMMITTED to refer to? PREV, BASE, and COMMITTED can only refer
>> to a working copy paths. If your merge source is a working copy path
>> these will work, but AFAICT this has never produced anything but an
>> error with URL merge sources.

It's an invalid case with BASE, PREV, COMMITTED with a merge source as a
URL, but as stated in
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2414438
when the above merge case happens, error message obtained is like:

"svn:'/home/kannan/wcs/devwc/http:/localhost/repos/devrepo/branch' is
not under version control"

which needs to be changed. The patch attached herewith provides a
customized error message related to the case above.

[[[
Log:
When `svn merge' with either BASE or PREV or COMMITTED as a revision
range and source as a URL is invoked, provide a customized error message
related to the case.

* subversion/libsvn_client/merge.c
 (normalize_merge_sources): Same as above.

Patch by: Kannan R <kannanr_at_collab.net>
]]]

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

iQEVAwUBSv1TaHlTqcY7ytmIAQK+wQf+PrOJGO3J4Rd+loS+jlH/OpAo2N3j6EFH
9iJqlc12ZHfjvjps8VOkfg8mMq4oBKJejDNlJ1KjDjFj1ipo8LgKF/yVZN1wYhH0
AsdUgRTr8L68LAZNgndZcGwisQ7EM3IJyZrYCdoMCpRub+I6SYoCC6oQzdloLDse
wQWDHB+1jidxGgxhJsdyj0LOTOp3dsYWT0a643ILkWWB3W6mA2pMGUAX6HEGS20K
cmUjSXWJf9x8lyM+lZFO4lIC8CgKVik98LCPuyZAv8O5CtZuqsLBV7ZG3CocXYC6
yI06ICZ9gxkro8HXG2SJ0VKjFSbGCSsTzhSR5K7xqbkRNAzvN8kg8w==
=dRl2
-----END PGP SIGNATURE-----

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

Received on 2009-11-13 13:42:12 CET

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