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

Re: merge corrupts WC

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2006-01-04 00:34:36 CET

On 1/3/06, Sven Brueggemann <SBrueggemann@gmx.net> wrote:
> Hello,
>
> attached you'll find a very small fsfs test repository
> (created with TSVN under Windows) to reproduce quite a
> severe WC corruption.
>
> Here's a CLI recipe (thanks to Stefan Küng):
>
> > $ 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.
>
> Since I have this problem in my production environment, I'd
> appreciate any hints on how to work around that problem.

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.

-garrett

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jan 4 00:37:26 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.