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

replace breaks WC (was: Re: replace renamed file in one transaction?)

From: Sven Brueggemann <SBrueggemann_at_gmx.net>
Date: 2006-01-03 19:25:14 CET

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.

Kind regards

Sven

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Jan 3 19:25:18 2006

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

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