You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Jay Levitt <li...@shopwatch.org> on 2005/10/15 01:00:07 UTC

[PATCH] svn_load_dirs should check for existing .svn directories

[[[

svn_load_dirs should check for existing .svn directories

Patch by: Jay Levitt <ja...@jay.fm>
Suggested by: Ryan Schmidt <su...@ryandesign.com>

The existence of .svn directories practically guarantees the failure
of svn_load_dirs, since they will be from some repository or directory
other than the one we're about to create.  This patch checks for .svn
directories, writes their paths to stdout, and aborts the import if
any are found.

* subversion/contrib/client-side/svn_load_dirs.pl.in
  (svn_dirs_present): New function.
 
]]]


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

Re: [PATCH] svn_load_dirs should check for existing .svn directories

Posted by Blair Zajac <bl...@orcaware.com>.
Michael W Thelen wrote:
> Daniel Rall wrote:
> 
>>On Thu, 20 Oct 2005, Jay Levitt wrote:
>>...
>>
>>
>>>That's because I was being -so- careful about the attachment that I sent 
>>>the patch to myself first, to make sure that Thunderbird's MIME output 
>>>would be acceptable to the automated patch-seeking scripts.  Then I 
>>>carefully viewed the source of the generated message, and decided it 
>>>looked OK.  So I resent it to the list... without the attachment.
>>
>>>Here it is now.  It doesn't look for _svn; when is that used instead of 
>>>.svn?  My Windows client creates .svn dirs.
> 
> 
> It still looks like the patch didn't make it to the list... Jay, I think
> you may have sent it just to Daniel.  Would you mind resending it to the
> list?

I just ran into this bug myself and committed a fix for it in r18549.  I'll be 
proposing this fix for the 1.3.x branch.

I read this message after I committed the fix, but I don't see the point in 
bailing out if .svn or _svn directories exist.  My solution just ignores the 
.svn and _svn directories.

Regards,
Blair

-- 
Blair Zajac, Ph.D.
CTO, OrcaWare Technologies
<bl...@orcaware.com>
Subversion training, consulting and support
http://www.orcaware.com/svn/

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

Re: [PATCH] svn_load_dirs should check for existing .svn directories

Posted by Michael W Thelen <mi...@pietdepsi.com>.
Daniel Rall wrote:
> On Thu, 20 Oct 2005, Jay Levitt wrote:
> ...
> 
>>That's because I was being -so- careful about the attachment that I sent 
>>the patch to myself first, to make sure that Thunderbird's MIME output 
>>would be acceptable to the automated patch-seeking scripts.  Then I 
>>carefully viewed the source of the generated message, and decided it 
>>looked OK.  So I resent it to the list... without the attachment.
> 
>>Here it is now.  It doesn't look for _svn; when is that used instead of 
>>.svn?  My Windows client creates .svn dirs.

It still looks like the patch didn't make it to the list... Jay, I think
you may have sent it just to Daniel.  Would you mind resending it to the
list?

-- 
Michael W Thelen
It is a mistake to think you can solve any major problems just with
potatoes.       -- Douglas Adams

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

Re: [PATCH] svn_load_dirs should check for existing .svn directories

Posted by Daniel Rall <dl...@finemaltcoding.com>.
On Thu, 20 Oct 2005, Jay Levitt wrote:
...
> That's because I was being -so- careful about the attachment that I sent 
> the patch to myself first, to make sure that Thunderbird's MIME output 
> would be acceptable to the automated patch-seeking scripts.  Then I 
> carefully viewed the source of the generated message, and decided it 
> looked OK.  So I resent it to the list... without the attachment.
 
:-)

> Here it is now.  It doesn't look for _svn; when is that used instead of 
> .svn?  My Windows client creates .svn dirs.

http://svn.collab.net/repos/svn/trunk/notes/asp-dot-net-hack.txt

> And are _svn dirs 
> guaranteed to be bad, the way .svn dirs are?  Or might I create a dir 
> called _svn and successfully check it in? 

I think they're just as bad.

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

Re: [PATCH] svn_load_dirs should check for existing .svn directories

Posted by Daniel Rall <dl...@finemaltcoding.com>.
On Fri, 14 Oct 2005, Jay Levitt wrote:

> [[[
> 
> svn_load_dirs should check for existing .svn directories
> 
> Patch by: Jay Levitt <ja...@jay.fm>
> Suggested by: Ryan Schmidt <su...@ryandesign.com>
> 
> The existence of .svn directories practically guarantees the failure
> of svn_load_dirs, since they will be from some repository or directory
> other than the one we're about to create.  This patch checks for .svn
> directories, writes their paths to stdout, and aborts the import if
> any are found.
> 
> * subversion/contrib/client-side/svn_load_dirs.pl.in
>  (svn_dirs_present): New function.
> 
> ]]]

There's no patch attached to this message, and I didn't notice any
follow-ups.  Also, does this account for "_svn" dirs?

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