Re: Conflicts

Eric Lemes wrote:
> Hi there,
>
> I have a question about conflict resolution in TortoiseSVN. I'm
> currently using TSVN 1.5.3. <http://1.5.3.> within a 1.4.2 server.
>
> When I do an update and a conflict files appear, I first edit the
> conflicts (with Araxis Merge) and left the ".mine" file in the correct
> state. Then I click in "Resolved".
>
> Then the file appears as changed and I can commit it. In this version,
> the file appears with the ">>>>>>>>" conflict markers.
>
> Is this behavior correct? I think in older versions (1.4.x), TSVN
> automatically removes the conflict markers.

TSVN *never* removed the conflict markers automatically. Neither in 1.5
nor in 1.4 or even earlier versions. Think about it: how could TSVN know
for sure that ">>>>>>>>" is part of a conflict marker and not part of
your normal file content?

You've configured your merge tool wrong. When it resolves a conflict, it
must save the resolved file to the original file (the ones which you say
still has the conflict markers in it). If your merge tool does not
remove those, then it doesn't really resolve the conflict (or saves the
resolved file somewhere else).

Clicking on "Resolved" actually does not much: it simply tells
Subversion that *you* have resolved the conflict (it marks the file as
resolved, it does not resolve the conflict).

Stefan

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