Gre7g wrote:
> I'm a Windows user with a fairly "branchy" repository structure. Today
> I realized that one of my product development directories was in a bad
> place and needed its own branch. Development was at:
>
> http://svn.kyoht.com/coyote/RIO-28/trunk/IDE
>
> and I decided to move it to:
>
> http://svn.kyoht.com/coyote/IDE/trunk
>
> I have lots of projects with their own trunk/tags/branches
> directories, but since they're closely intertwined, I keep them in one
> repository. I don't mind that it looks like revisions are "missing" in
> one project since they were used to update another.
>
> I'm a tortoisesvn user, so I:
>
> * created my IDE, IDE/tags, and IDE/branches directories
>
> * right-clicked on IDE, and added it to the repository
>
> * committed IDE, IDE/tags, and IDE/branches
>
> * right-click dragged RIO-28/trunk/IDE into the new IDE directory,
> chose "svn move and rename" and entered the name "trunk"
>
> At this point, everything looked fine. The old directory was marked
> with an "X" to indicate it was going to be deleted and my working
> directory was moved and renamed.
>
> I right-clicked on RIO-28/trunk and committed the delete portion of
> the move. Worked fine.
That's the mistake. You committed only half of the move. Always commit
both portions (the delete and the add portion) of a move in the same commit.
> I right-clicked the new IDE/trunk directory and did a commit, entered
> a log message, and hit OK. I got an odd error message that one of my
> files already existed, so I repeated this commit from cygwin so I
> could eliminate tortoisesvn as the problem. I re-entered the log
> message and got the following:
>
> File svn-commit.2.tmp saved
> Adding trunk
> Adding trunk/AdvancedSplash.py
> Adding trunk/CTRL/ControlObj.py
> svn: Commit failed (details follow):
> svn: File '/coyote/IDE/trunk/CTRL/ControlObj.py' already exists
> svn: Your commit message was left in a temporary file:
> svn: '/cygdrive/c/Documents and Settings/Gre7g Luterman/My
> Documents/Projects/Coyote DataCom/svn/IDE/svn-commit.2.tmp'
>
> I really don't know what this means or how to fix it. If I surf up my
> repository browser at http://svn.kyoht.com/coyote/IDE/ (password
> required, so don't bother), it shows branches and tags, but no trunk
> (as I would expect). So CTRL/ControlObj.py may exist somewhere else,
> but it sure doesn't exist at IDE/trunk.
>
> I tried "svn cleanup trunk" which returns silently, but it doesn't
> seem to change anything. Same is true of "svn update trunk".
>
> What did I do wrong? How do I fix it? How do I keep this from
> happening again?
What you did wrong was to commit only half of the move. So you know now
how to keep this from happening again.
About how to fix this, I don't really know. You should ask on the
Subversion mailing list for help with this.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
Received on 2008-10-30 18:36:34 CET