You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Brett Coon <br...@gmail.com> on 2009/08/17 18:14:20 UTC
Can't copy to new branch because file exists?? (was Re: Confused
about branches and partial switches)
In a discussion last month, BRM provided this helpful hint:
On Thu, Jul 9, 2009 at 5:34 PM, BRM <bm...@yahoo.com> wrote:
>
> Also, svn makes it really easy to branch from a working copy - even if you
> haven't committed the changes to the current tree location. I've found this
> very useful, especially when I made changes I didn't want to commit to that
> tree but wasn't sure I wanted to toss out yet - just do 'svn copy .
> http://svn/svn/project/branches/brett/branch-name' (not the period beween
> 'copy' and 'http').
I filed this away for later use because it seemed like such a great feature,
and finally tried to use it today (I just got back from vacation, and wanted
to save my uncommitted pre-vacation changes to a branch before updating my
tree).
Unfortunately, when I try to do this, the copy fails with this message (file
and directory names changed to hide internal project name references):
svn: Commit failed (details follow):
svn: File '/svn/project/branches/bcoon/b2/hw/b/f/v/TEF.v' already exists
svn: Your commit message was left in a temporary file:
svn: 'svn-commit.tmp'
But there is no b2 branch yet!! So how could a file exist in this branch?
Here's what svn list reports:
svn list ^/branches/bcoon
b1/
svn list http://svn/svn/project/branches/bcoon/b2
svn: URL 'http://svn/svn/project/branches/bcoon/b2' non-existent in that
revision
I tried doing the copy to a different *new *branch, "b3", and got the same
error.
For the record, here is the copy command I'm using:
svn copy . http://svn/svn/project/branches/bcoon/b2
I'm perplexed. And stumped. And grumpy about my vacation being over.
-Brett
--
Brett Coon - brett.coon@gmail.com - http://brettcoon.smugmug.com
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2384471
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: Can't copy to new branch because file exists?? (was Re:
Confused about branches and partial switches)
Posted by Brett Coon <br...@gmail.com>.
Thanks! I'm tried the suggested "svn update --depth empty" workaround, and
that seems to have worked for me.
-Brett
On Mon, Aug 17, 2009 at 11:17 AM, Mark Phippard <ma...@gmail.com> wrote:
> On Mon, Aug 17, 2009 at 2:14 PM, Brett Coon<br...@gmail.com> wrote:
> > In a discussion last month, BRM provided this helpful hint:
> >
> > On Thu, Jul 9, 2009 at 5:34 PM, BRM <bm...@yahoo.com> wrote:
> >>
> >> Also, svn makes it really easy to branch from a working copy - even if
> you
> >> haven't committed the changes to the current tree location. I've found
> this
> >> very useful, especially when I made changes I didn't want to commit to
> that
> >> tree but wasn't sure I wanted to toss out yet - just do 'svn copy .
> >> http://svn/svn/project/branches/brett/branch-name' (not the period
> beween
> >> 'copy' and 'http').
> >
> > I filed this away for later use because it seemed like such a great
> feature,
> > and finally tried to use it today (I just got back from vacation, and
> wanted
> > to save my uncommitted pre-vacation changes to a branch before updating
> my
> > tree).
> >
> > Unfortunately, when I try to do this, the copy fails with this message
> (file
> > and directory names changed to hide internal project name references):
> >
> > svn: Commit failed (details follow):
> > svn: File '/svn/project/branches/bcoon/b2/hw/b/f/v/TEF.v' already exists
> > svn: Your commit message was left in a temporary file:
> > svn: 'svn-commit.tmp'
> >
> > But there is no b2 branch yet!! So how could a file exist in this
> branch?
> > Here's what svn list reports:
> >
> > svn list ^/branches/bcoon
> > b1/
> >
> > svn list http://svn/svn/project/branches/bcoon/b2
> > svn: URL 'http://svn/svn/project/branches/bcoon/b2' non-existent in that
> > revision
> >
> > I tried doing the copy to a different new branch, "b3", and got the same
> > error.
> >
> > For the record, here is the copy command I'm using:
> >
> > svn copy . http://svn/svn/project/branches/bcoon/b2
> >
> > I'm perplexed. And stumped. And grumpy about my vacation being over.
>
> This is a known bug.
>
> http://subversion.tigris.org/issues/show_bug.cgi?id=3119
>
> Fix is coming in SVN 1.6.5 client.
>
> --
> Thanks
>
> Mark Phippard
> http://markphip.blogspot.com/
>
--
Brett Coon - brett.coon@gmail.com - http://brettcoon.smugmug.com
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2384480
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: Can't copy to new branch because file exists?? (was Re:
Confused about branches and partial switches)
Posted by Mark Phippard <ma...@gmail.com>.
On Mon, Aug 17, 2009 at 2:14 PM, Brett Coon<br...@gmail.com> wrote:
> In a discussion last month, BRM provided this helpful hint:
>
> On Thu, Jul 9, 2009 at 5:34 PM, BRM <bm...@yahoo.com> wrote:
>>
>> Also, svn makes it really easy to branch from a working copy - even if you
>> haven't committed the changes to the current tree location. I've found this
>> very useful, especially when I made changes I didn't want to commit to that
>> tree but wasn't sure I wanted to toss out yet - just do 'svn copy .
>> http://svn/svn/project/branches/brett/branch-name' (not the period beween
>> 'copy' and 'http').
>
> I filed this away for later use because it seemed like such a great feature,
> and finally tried to use it today (I just got back from vacation, and wanted
> to save my uncommitted pre-vacation changes to a branch before updating my
> tree).
>
> Unfortunately, when I try to do this, the copy fails with this message (file
> and directory names changed to hide internal project name references):
>
> svn: Commit failed (details follow):
> svn: File '/svn/project/branches/bcoon/b2/hw/b/f/v/TEF.v' already exists
> svn: Your commit message was left in a temporary file:
> svn: 'svn-commit.tmp'
>
> But there is no b2 branch yet!! So how could a file exist in this branch?
> Here's what svn list reports:
>
> svn list ^/branches/bcoon
> b1/
>
> svn list http://svn/svn/project/branches/bcoon/b2
> svn: URL 'http://svn/svn/project/branches/bcoon/b2' non-existent in that
> revision
>
> I tried doing the copy to a different new branch, "b3", and got the same
> error.
>
> For the record, here is the copy command I'm using:
>
> svn copy . http://svn/svn/project/branches/bcoon/b2
>
> I'm perplexed. And stumped. And grumpy about my vacation being over.
This is a known bug.
http://subversion.tigris.org/issues/show_bug.cgi?id=3119
Fix is coming in SVN 1.6.5 client.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2384473
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: Can't copy to new branch because file exists?? (was Re:
Confused about branches and partial switches)
Posted by Stefan Sperling <st...@elego.de>.
On Mon, Aug 17, 2009 at 11:14:20AM -0700, Brett Coon wrote:
> svn: Commit failed (details follow):
> svn: File '/svn/project/branches/bcoon/b2/hw/b/f/v/TEF.v' already exists
> svn: Your commit message was left in a temporary file:
> svn: 'svn-commit.tmp'
>
> But there is no b2 branch yet!! So how could a file exist in this branch?
> I'm perplexed. And stumped. And grumpy about my vacation being over.
Looks like the following bug fix which will be in 1.6.5 will help you,
except for the part about your vacation being over.
http://svn.collab.net/viewvc/svn?view=revision&revision=38130
Stefan
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2384483
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].