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

Re: create branch failed

From: Helge Kruse <Helge.Kruse-nospam_at_gmx.net>
Date: Tue, 6 Jan 2009 20:40:36 +0100

----- Original Message -----
From: "Konstantin Kolinko" <knst.kolinko_at_gmail.com>
To: "Helge Kruse" <HelgeKruse_at_t-online.de>
Cc: <users_at_subversion.tigris.org>
Sent: Tuesday, January 06, 2009 7:36 PM
Subject: Re: create branch failed

> 2009/1/5 Helge Kruse <HelgeKruse_at_t-online.de>:
>> Hello,
>>
>> I want to reorganize my repository and create a trunk/branch structure.
>>
>> I moved the former root to /trunk and created a /branch directory and commited it with the repository. Now I wanted to create the
>> specific branch. I accidentily used
>>
>> svn copy /trunk/Product /branch/x.y/Product
>>
>> This copied the complete tree below Product to the new branch. I deleted the local x.y/Product tree and used
>>
>> svn revert /branch
>>
>> before any commit. Now I wanted to create the directories x.y and Product and "svn copy" the directories to Product.
>> Unfortunately
>> this doesnt work:
>>
>> svn mkdir x.y
>> svn: 'x.y' is already under version control
>>
>> I tried to revert, update and cleanup. But I cant get rid off the x.y directory:
>>
>> cd /branch
>> svn cleanup .
>> svn st
>> ! x.y
>>
>> svn revert .
>> svn st
>> ! x.y
>>
>> svn update
>> At revision 114.
>>
>> svn st
>> ! x.y
>>
>> But the repository doesn hold this directory:
>>
>> svn ls
>> (no entries listed here)
>>
>> How do I get in sync again and copy efficiently specific directories from the trunk to the branches?
>>
>> Regards,
>> Helge
>>
>
> Revert of a copy operation performed on a working copy (and that copy
> operation, actually, consists of physically copying the file plus
> "adding" it) does revert only the "add" part of it. The copied files
> and subdirectories remain on your system.

That is not the problem I deleted the repository with "svn delete" and cant create it at the place again.

> To get rid of those extra files, just remove them (rm -f I suppose)
I did it with Windows Explorer; without "rm -f" ;-)
The files can be removed but the status
  ! x.y
remains in the SVN binding (the .svn/entries file I suppose).

> Also, I recommend you to learn how to use the copy command directly on
> the repository, without affecting the working copy. That is, to use
> URL -> URL copy instead of WC -> WC one that you are using. I prefer
> to use that one when creating tags.
Under that condition I have no revert capability at all. I am human. Errare humanum est. Therefor I want to prepere everything and
then commit it.

Regards,
Helge

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1008309

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-01-06 20:52:54 CET

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