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

Re: TortoiseMerge whitespace options and conflicts

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: 2007-07-10 23:19:50 CEST

On 10/07/07, Graham Bloice <gbloice@gmail.com> wrote:
> TSVN 1.4.3
>
> Recently a user had a conflict after a merge into the working copy, so they
> fired up TortoiseMerge. In the options they had the radio button set to
> "Ignore all whitespaces" and this had the effect of hiding the conflicts
> which were partially due to whitespaces. Even though they couldn't see the
> conflicts, they still clicked the "Mark as resolved". What happened next
> isn't clear, but somehow they managed to commit the file to the trunk with
> the conflict markers still in the file. The ancillary conflict files were
> deleted.
>
> Out of this arose a number of questions:
>
> 1. Should the TortoiseMerge option "Ignore all whitespaces" hide conflicts
> in files?

In the trunk build it doesn't hide them. I don't have 1.4.x installed
here to try it.

> 2. Can anyone explain why the conflict markers were not removed. My best
> guess is that the file was locked by another process, maybe an editor, but
> shouldn't TSVN have warned about this?

When you mark as resolved it is assumed that you have sorted out the
conflicts, or that you intend to do so manually. In the trunk build
you get a warning in TortoiseMerge if you try to mark as resolved
while there are still conflicts. At that stage if you say 'yes, mark
as resolved', the temp files are removed and the file left with its
conflict markers.

> 3. Not really a TSVN question, but how does svn determine that a conflict
> still exists, it isn't only the presence of the ancillary files, is it
> something in the entries file?

Now there's an interesting question. If you delete the ancillary
files, TSVN reports the file as modified, but in the commit and check
for modifications dialogs it is still shown in red, which implies
conflicted. SVN still lets you commit, though.

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Jul 10 23:19:23 2007

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