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

RE: Strange new problem with tree conflicts

From: Todd C. Gleason <tgleason_at_impac.com>
Date: Fri, 11 Sep 2009 14:21:24 -0700

> -----Original Message-----
> From: Jeff Simon [mailto:jas_at_rephunter.net]
> Sent: Thursday, September 10, 2009 11:54 PM
> To: users_at_tortoisesvn.tigris.org
> Subject: RE: Strange new problem with tree conflicts
>
> As you suspected, much of what you are suggesting does not apply.
>
> However, the part about "delete/copy" might be related.
>
> I have been using TSVN with SVN for a bit over two years. For all of
the
> early part of that work, when there was only one or two file changes
that
> needed to be merged, I would just copy from one working copy directly
to
> the other.
>
> While this is not a two-step delete followed by copy, it may have the
same
> effect.
>
> Is this previously workable procedure now causing this problem?

If you are just using Windows Explorer to copy a file from one WC to
another, then no, that's just another way of editing the file so far as
the destination WC can tell.

If you are copying a directory, including the .svn folders, from one WC
to another, then if they have different paths, you create a situation
with switched subtrees. I don't know whether that would lead to tree
conflicts or not...it could though.

If you have two WCs open and right-drag the file and use TortoiseSVN to
copy the file Subversion-style, then maybe (I don't really know) it
might cause this problem. In order for that to work though, TortoiseSVN
would have to prepare a delete-and-copy pair of operations for when you
committed. Once you do commit that, any other WC pointing at the same
location has a bit of an issue; it will see a delete and copy happen.
If this happens where that WC has edited the file, then yes, it would be
a tree conflict, because the ancestry for that URL has been changed--it
no longer comes from the same URL, previous revision, but instead from a
different URL and revision.

So which kind of copying are you doing? Can you show us how it shows up
in the log after you've committed?

It might help for you to check the logs on the files that have tree
conflicts...if you see this copying going on, then that is probably your
problem. If so, you should favor merging over copying.

--Todd

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2393730

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-09-11 23:27:05 CEST

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