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

Re: Compare with WC showing false conflicts?

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-07-14 09:35:49 CEST

Simon Large wrote:
> Hi folks,
> In an up-to-date WC edit one file by adding a line at the end, and
> another by adding a line in the middle.
> Show log and compare HEAD with WC.
> Files with changes in the middle show in red and come up in 3-pane view.
> Files with line added show in black and come up in 2-pane view.
> I think the conflict is false. The new line is shown as added in mine
> and theirs, but in fact it was only added to mine.

I can't reproduce this here. I used the 'build.txt' file in our trunk
* added an empty line after the "C. If..." section
* added an empty line at the end
both changes were not marked as conflicted
* added a line "test" after the "C. If..." section
* added a line "test" at the end
both changes were not marked as conflicted

Do you have maybe a recipe to reproduce this?


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Jul 14 09:35:14 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.