[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: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Tue, 08 Sep 2009 20:38:16 +0200

On 08.09.2009 18:57, Jeffrey Simon wrote:
> For no apparent reason, I have tree conflicts in my project. I am
> thinking this might be a bug in TSVN for the following reasons:
>
> 1. There is no reason that such a conflict should be reported.
>
> 2. All of the files in my working copy in all three branches and in
> the repo are respectively identical on a per file basis.
>
> 3. My repo structure has three branches within it as follows
> - dev
> - current
> - stable
> - production
>
> The tree conflict shows up for a couple of dozen file when I do a
> commit on dev. However, when I do a commit on each of the three
> branches separately, no tree conflict is shown.

What exactly is shown in the commit dialog? Maybe a screenshot would help.

> 4. When this first happened a week or so ago, I checked out a whole
> new copy of dev. After than, no tree conflict was reported for a few
> days. Then suddenly, it showed up again. Nearly all the the files with
> the reported tree conflict have been changed any time recently.

A tree conflict happens only during merges and (very rarely) during
updates. Not during commits.

> 5. I have also tried cleanup on TVSN 1.6.3, just to see if it helped,
> but it does not. So then I updated to 1.6.4.16974 and ran cleanup
> again. This time, after cleanup, the bang icon on the folder went
> away. But trying the commit on that folder still has the tree confilct
> on the same set up files.

Are you sure those are tree conflicts? Those can only be resolved, not
cleaned up.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2392603
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-09-08 20:38:32 CEST

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