You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by John Belmonte <jo...@neggie.net> on 2005/01/09 05:29:30 UTC

[PATCH] have svnmerge use repo-local paths instead of URL's

Currently, svnmerge uses repository URL's in its branch metadata.  That 
scheme won't work when you have multiple repository access methods, or 
find yourself moving your repository.

This patch has svnmerge use repository-local paths instead of URL's. 
Graceful upgrades from the old scheme are supported, assuming that the 
URL is still valid.

-John

Re: [PATCH] have svnmerge use repo-local paths instead of URL's

Posted by Archie Cobbs <ar...@dellroad.org>.
John Peacock wrote:
>>> If I can figure out how to do it for the keywords patch, the 
>>> information will be available in the WC (probably in the entries 
>>> file) and it can be exposed via 'svn info' too.
>>
>> Sounds good. OK to file a feature request for this?
> 
> You may just want to add this to issue #960, which specifically 
> discusses the availability of the repos_root in the WC (but not how to 
> expose it).  I suppose then 960 should be made dependent on 890 for 
> completeness.

Thanks, I added a comment to #960 but did not add any dependency,
since that part is a little beyond my knowledge.

-Archie

__________________________________________________________________________
Archie Cobbs      *        CTO, Awarix        *      http://www.awarix.com


*
Confidentiality Notice: This e-mail message, including any attachments, is for the sole use of the intended recipient(s) and may contain confidential and privileged information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended
recipient, please contact the sender by reply e-mail and destroy all copies of the original message.
*


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: [PATCH] have svnmerge use repo-local paths instead of URL's

Posted by John Peacock <jp...@rowman.com>.
Archie Cobbs wrote:

> John Peacock wrote:
>>If I can figure out how to do it for the keywords patch, the information 
>>will be available in the WC (probably in the entries file) and it can be 
>>exposed via 'svn info' too.
> 
> 
> Sounds good. OK to file a feature request for this?

You may just want to add this to issue #960, which specifically 
discusses the availability of the repos_root in the WC (but not how to 
expose it).  I suppose then 960 should be made dependent on 890 for 
completeness.

John

-- 
John Peacock
Director of Information Research and Technology
Rowman & Littlefield Publishing Group
4501 Forbes Boulevard
Suite H
Lanham, MD  20706
301-459-3366 x.5010
fax 301-429-5748

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: [PATCH] have svnmerge use repo-local paths instead of URL's

Posted by Archie Cobbs <ar...@dellroad.org>.
John Peacock wrote:
>> Perhaps there should be a feature request that 'svn info' print the
>> repository root (i.e., URL minus relative path). Then your 
>> get_repo_root()
>> could be much simpler and not require N queries over the network.
> 
> If I can figure out how to do it for the keywords patch, the information 
> will be available in the WC (probably in the entries file) and it can be 
> exposed via 'svn info' too.

Sounds good. OK to file a feature request for this?

-Archie

__________________________________________________________________________
Archie Cobbs      *        CTO, Awarix        *      http://www.awarix.com


*
Confidentiality Notice: This e-mail message, including any attachments, is for the sole use of the intended recipient(s) and may contain confidential and privileged information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended
recipient, please contact the sender by reply e-mail and destroy all copies of the original message.
*


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: [PATCH] have svnmerge use repo-local paths instead of URL's

Posted by John Peacock <jp...@rowman.com>.
Archie Cobbs wrote:

> Perhaps there should be a feature request that 'svn info' print the
> repository root (i.e., URL minus relative path). Then your get_repo_root()
> could be much simpler and not require N queries over the network.

If I can figure out how to do it for the keywords patch, the information 
will be available in the WC (probably in the entries file) and it can be 
exposed via 'svn info' too.

John

-- 
John Peacock
Director of Information Research and Technology
Rowman & Littlefield Publishing Group
4501 Forbes Boulevard
Suite H
Lanham, MD  20706
301-459-3366 x.5010
fax 301-429-5748

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: [PATCH] have svnmerge use repo-local paths instead of URL's

Posted by Archie Cobbs <ar...@dellroad.org>.
John Belmonte wrote:
> Currently, svnmerge uses repository URL's in its branch metadata.  That 
> scheme won't work when you have multiple repository access methods, or 
> find yourself moving your repository.
> 
> This patch has svnmerge use repository-local paths instead of URL's. 
> Graceful upgrades from the old scheme are supported, assuming that the 
> URL is still valid.

Looks great, I'll commit it.

A couple of comments:

Perhaps there should be a feature request that 'svn info' print the
repository root (i.e., URL minus relative path). Then your get_repo_root()
could be much simpler and not require N queries over the network.

I'm still holding out faint hope that someday SVN will support inter-repo
merges (apparently I'm the only one though; when I tried to file a feature
request I was shot down). When/if that ever happens, we can have support
for either relative or absolute head URLs.

Thanks,
-Archie

__________________________________________________________________________
Archie Cobbs      *        CTO, Awarix        *      http://www.awarix.com


*
Confidentiality Notice: This e-mail message, including any attachments, is for the sole use of the intended recipient(s) and may contain confidential and privileged information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended
recipient, please contact the sender by reply e-mail and destroy all copies of the original message.
*


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org