Sorry, I meant that both the folder and text file were created in the
working copy and then committed, and then the folder was renamed. That
is what causes the problem. Thanks.
On Thu, Jul 16, 2009 at 9:27 PM, Tyler Roscoe<tyler_at_cryptio.net> wrote:
> On Thu, Jul 16, 2009 at 07:10:16PM -0400, Jonathan Derryberry wrote:
>> I tried to rename a nonempty folder and then update, and a tree
>> conflict resulted. I've worked for a while on a way to get around it
>> to no avail. I'm using Vista with the current version of tortoisesvn
>> to perform the operations. This potential bug can be produced by
>> adding an empty folder (say "foo") to a working copy, adding a new
>> text file "bar.txt" into folder "foo". Then renaming foo to "foo2" and
>> updating causes a tree conflict. Is this a known issue or bug?
>
> I have never had good luck with moving things around that weren't
> committed. I recommend committing after you add a directory and before
> moving that directory around.
>
> The smarter people might have more to say on this matter.
>
> tyler
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2371930
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-07-17 15:11:42 CEST