[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: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: 2007-07-14 12:31:58 CEST

On 14/07/07, Stefan Küng <tortoisesvn@gmail.com> wrote:
> 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
> folder:
> * 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?

In our doc/test folder run maketest.bat

In doc/test/temp/doc:
* insert a blank line between paragraphs in dug_ignore.xml
* add a blank line at the end of dug_export.xml
* showlog for the folder
* for latest revision in top pane, compare with WC

The patch window shows dug_export.xml in black and dug_ignore.xml in
red and you get 2 and 3 pane views respectively.


  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 12:31:20 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.