[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: Paul Burba <ptburba_at_gmail.com>
Date: Fri, 13 Nov 2009 14:45:40 -0500

On Fri, Nov 13, 2009 at 7:39 AM, Kannan <kannanr_at_collab.net> wrote:
> -----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.

Hi Kannan,

I agree, that error message, while true, is not very helpful. I
committed your patch in r40504.

I made a few minor changes:

1) I tweaked the indentation on the if statement slightly

2) I changed the wording of the error message to be more specific.

3) I edited your log message. We try to keep the first line of the
log message under 80 characters so when it flashes by on the #svn-dev
channel and IRC the people there can get an idea what the change is
about -- see http://svn.collab.net/repos/svn/trunk/www/hacking.html#log-messages.
 This is not always possible of course, but we try.

Thanks,

Paul

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2417717
Received on 2009-11-13 20:45:53 CET

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