On 1/4/06, Sven Brueggemann <SBrueggemann@gmx.net> wrote:
> Hello,
>
> Garret Rooney wrote:
>
> [merge involving a replace (deletion of a file and addition
> of a file with the same name) in a single or multiple
> transactions]
> >> > $ svn co file:///d:/test/BrokenWC/trunk brokenwc
> >> > $ svn merge file:///d:/test/BrokenWC/branch/branch1_at_HEAD
> >> > file:///d:/test/BrokenWC/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/BrokenWC/branch/branch1_at_HEAD
> >> > file:///d:/test/BrokenWC/trunk_at_HEAD brokenwc --force
> >> > Which also corrupts the wc, but even worse than without the
> >> > --force flag.
> >>
> >> tested with svn 1.3 and 1.2.3.
>
> > I'm not sure what the actual change that fixed it was, but this
> > problem does not seem to occur with a client built from the trunk, so
> > I imagine it's been fixed since the 1.3.x branch was started.
>
> Can someone please give me the revision when this was fixed?
> I'd like to be sure that it is indeed fixed an not just not
> reproducable.
>
> There was another report of this problem on the TSVN mailing
> list today.
As Erik already said, it's most likely fixed in the wc-replacements
changes that were merged into the trunk just after 1.3.x was branched.
There were a lot of changes in that though, so it's hard to say. If
you try with the current trunk it should work though.
-garrett
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jan 5 00:23:30 2006