Re: Compare with WC showing false conflicts?

On 7/14/07, Simon Large <simon.tortoisesvn@googlemail.com> wrote:
> 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.

Just noticed:
this is in fact a conflict (even though that's open for discussion :) ).

When you "compare with WC", we create a patch/diff file from rev to
WC. This patchfile contains the line you just added to dug_ignore.xml.
And of course the dug_ignore.xml file in the working copy has this
line already added.
Then TortoiseMerge is started, trying to apply the patchfile to the
working copy.

Ok, I admit: TMerge should discover that it adds the same line that
already exists and just ignore it. But it *is* kind of a conflict -
and it will show you that the conflict is automatically resolvable in
the 3 pane view.

Stefan

-- 
       ___
  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