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

Compare with WC showing false conflicts?

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: 2007-07-14 01:30:00 CEST

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.


  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 01:29:21 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.