Re: replace breaks WC

Sven Brueggemann wrote:
> Hello,
>
> I did an "add (as replacement)" a while ago. Now I noticed that any
> merge operation involving the revision I did the replace in, kills
> the working copy.
>
> I attached a very small repository to demonstrate the problem.
>
> 1. Checkout trunk
> 2. merge from branch/branch1@HEAD to trunk@HEAD
> 3. After that, any update or status fails. The WC is broken.
>
> First: Do I have a chance to workaround this problem?
>
> Second: Is this an Subversion issue or is it TSVN?
>
> If it's Subversion, can someone please help me report the problem
> on the subversion list? I'm not so familiar with the CLI.

Can you report this on the Subversion mailing list please?

Here's the recipe with the CL client:

$ svn co file:///d:/test/BrokenWCRepo/trunk brokenwc
$ svn merge file:///d:/test/BrokenWCRepo/branch/branch1_at_HEAD
file:///d:/test/BrokenWCRepo/trunk_at_HEAD brokenwc
$ svn up
svn: working copy path 'dir1/dir2/TEST.ac' doesn't exist in repository

Also, TSVN uses the '--force' flag when doing merges, so you can also do
$ svn merge file:///d:/test/BrokenWCRepo/branch/branch1_at_HEAD
file:///d:/test/BrokenWCRepo/trunk_at_HEAD brokenwc --force

Which also corrupts the wc, but even worse than without the --force flag.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org