> -----Original Message-----
> From: Jeffrey Simon [mailto:jas_at_rephunter.net]
> Sent: Wednesday, September 09, 2009 3:31 PM
> To: users_at_tortoisesvn.tigris.org
> Subject: Strange new problem with tree conflicts
>
> I saw the response of Stefan to my original post, but do not see how
> to post a reply. The instructions say to "go to the project home page
> and click on Discussions", but I do not see such a link anywhere. So I
> am posting again to the list.
>
> Stefan requested a screen shot, saying in part that "tree conflicts do
> not occur in commits." Well then something is seriously wrong, as
> shown in the screen shot I have attached. It shows the commit dialog,
> with about 30 error messages of the form
>
> filename php missing, tree conflict
>
> Please note that the full path is not shown so I don't know which
> branch is referred to, and in fact none of the files are "missing"
> either from any of the working copies or from the repo.
>
> As far as I can tell there is nothing to resolve. Also, after the
> first time this happened, I checked out a new working copy, which
> worked for a bit, then the problem comes back.
One of our users saw something like this. In her case, she had done a
checkout and subsequent switch badly. For example, say that you have
these folders in Svn:
/trunk
/trunk/root
/trunk/root/A
/trunk/root/B
/trunk/root/C
/branches/BR1 (copy of /trunk)
/branches/BR1/root...
Say you checkout /branches/BR1/root to C:\WC. So you have:
C:\WC
C:\WC\A
C:\WC\B
C:\WC\C
Then say you do a switch on C:\WC to /trunk. I think what happens here
is that you can end up with:
C:\WC
C:\WC\A
C:\WC\B
C:\WC\C
C:\WC\root
C:\WC\root\A
C:\WC\root\B
C:\WC\root\C
In this case, you haven't switched to the identical level between branch
and trunk. I don't know if this happens all the time, or just if you
already had files modified in you WC before the switch. But now if you
edit under C:\WC\A then you have a problem--a tree conflict. Because
effectively you are saying that C:\WC\A ought to be mapped to /trunk/A,
which doesn't exist.
Jeffrey, I want to add that after reading your first message, it doesn't
look like this is necessarily the case; it looks more like you are
checking out multiple branches to one WC (all of dev, which you said
contains 3 branches). As long as your WC doesn't also directly contain
one of those branches, I don't see why you would get such an error. But
just in case, I wanted to mention the possibility.
If that's not it, then here are some other questions for you:
1. Do you frequently update your WC? Does this happen only after an
update?
2. Do other users replace files by deleting and copying from another
branch, instead of using merging? If so then the ancestry in the
destination branch would be wiped and no longer connected to the files
you have, which, if you have edited those same files, may cause a tree
conflict.
3. What do you see when you go to the root of your WC and check for
modifications?
--Todd
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2393324
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-09-10 17:18:17 CEST