Error when merging

Just had a problem with a merge. I don't use the command line client at
all, so I can't tell if this is cl or Tortoise but it can be reproduced
easily so I was hoping someone could confirm.

Currently using the Tortoise 1.3 RC1 release with ASP.NET hack. Tested
against Subversion 1.1.1 on Win2003 as the repository and also creating a
local repo through Tortoise.

Start with a simple repo
root
  branches
  trunk
    myfile.txt

Branch the trunk into a release branch. Then delete myfile.txt from trunk
and commit. Then add a new myfile.txt in it's place and commit.

Now merge the delete and add into the release branch and go to commit.
The commit box says "replaced+" under text status. Commiting gives the
error "Out of date: '/branch/release/myfile.txt' in transaction...".

Now, however, the working copy seems to be broken. Doing an update
returns "Working copy path 'myfile.txt' does not exist in repository" and
clean up has no effect.

Only deleting and re-checking out the working copy will fix the problem.

Thanks for your help.

Douglas

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Jan 4 23:06:40 2006