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

Re: possible bug in TortoiseSVN - resolve conflict

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 10 Jul 2008 13:46:39 +0200

Daniel Gyorfi wrote:
> Hi!
>
> Today, i have found that something in the "Resolved" option of
> TortoiseSVN 1.5 is not correct.

It is correct.

> it is not easy, but i try to be simple.

Me too, I hope you'll understand my explanation.

>
> I looked up an older revision of the repo of my working copy in the
> Log, then chose to "revert the changes of that revision".
> During the merge, the dialog showed that there are conflicts.
> After the merge, I opened the context menu of the conflicted file and
> chose the "resolved" option. the state of the file changed to
> "modified". after opening the TortiseDiff on this file, it showed the
> _characters of the conflict_ still in the file.
> The conflicted files disappeared (as I think TortoiseSVN deleted
> them), so the TortoiseSVN thought that this is just a modified file.

The "resolved" command is used to tell Subversion that *you* resolved
the conflict. That's why it then changes the status to "modified".
But since you really did not resolve the conflict but only told
Subversion that it was, you still have the conflict markers in your file.

> The same happens when I select the Edit Conflict during the merge
> dialog of the same revert. It opens the TortoiseMerge and shows that
> there are actually _no conflicts_ whatsoever. So I close the dialog of

Well, there are. But you most likely have TortoiseMerge configured to
ignore EOL/whitespace changes, so a conflict due to such differences
won't show up in TortoiseMerge.

> TortoiseMerge. After closing that, the "resolved" option becomes
> available, so I select that.
> In this case the same happens, the conflict files disappear and the
> characters showing the conflicted part are still there.

Yes of course. Again, you just told Subversion that you resolved the
conrflict, but you actually haven't resolved it (basically, you're lying
to Subversion).
You should have clicked on "save" in TortoiseMerge first.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net

Received on 2008-07-10 13:46:51 CEST

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