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

Re: Takeover Take 2 Was: Re: the 'takeover' feature

From: Michael Sweet <mike_at_easysw.com>
Date: 2006-04-22 02:11:34 CEST

Jonathan Gilbert wrote:
> At 01:33 PM 21/04/2006 -0400, you wrote:
>> Jonathan Gilbert wrote:
>>> ...
>>>> equivalent of a checkout in that directory, e.g.:
>>>>
>>>> svn import --takeover http://foo.bar.com/myproject/trunk
>>>>
>>>> to import the current directory or:
>>>>
>>>> svn import --takeover myproject http://foo.bar.com/myproject/trunk
>>>>
>>>> to import the named directory and setup a WC there.
>>> This is completely the opposite of the original reason I designed the
> feature.
>>> ...
>> OK, I've read your post, and I don't understand why this would be
>> "completely the opposite". My suggestion for an import option would
>> be equivalent to doing a checkout with option or a new takeover
>> command after the import.
>>
>> In short, why not provide an option to import that is a shortcut for
>> a (relatively) common use case?
>
> As I said before, "svn import"'s main function is to add files to the
> repository when the local copy is not a WC. The function of "svn takeover"
> is to turn something that is ostensibly a working copy, just not one that
> Subversion knows about, into an official SVN working copy without sending
> anything to the server. In fact, the latest revision is *retrieved* from
> the server, in order to build the text-base.
>
> Are you suggesting that "svn import --takeover" would *not* commit a new
> revision to the repository?

It could be implemented in one of two ways:

     1. Import (commit) as it does currently, and then takeover the
        imported directories as a WC.

     2. Create a WC with scheduled adds for all of the files and
        directories.

I'm thinking that #1 is trivial to implement using the (new) existing
checkout/takeover code, while #2 would be a much bigger effort.

> Are you talking about a separate feature here that would automate the
> process of "URL=svn://... (svn import $URL && svn takeover $URL)"?

Yes, exactly. Whether Subversion adds an option to import that
does the takeover is up to you guys, but it seems to me that a) this
is probably a pretty common use case, and b) it should be trivial
to add using the new APIs for the takeover stuff anyways.

Of course, if you don't add an option to import, I'll just write
another short script ("svnimport.sh") that combines the two commands
like I do for common merge and branch stuff...

-- 
______________________________________________________________________
Michael Sweet, Easy Software Products           mike at easysw dot com
Internet Printing and Publishing Software        http://www.easysw.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Apr 22 02:12:10 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.