Re: Compare with WC showing false conflicts?

On 19/07/07, Simon Large <simon.tortoisesvn@googlemail.com> wrote:
> On 14/07/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.
>
> Works OK in the latest nightly, but I have noticed another problem
> now. In my WC I added a line, so if I diff my WC I see a '+' line in
> the right pane and a gap in the left. If I show log and compare the WC
> with the previous revision I expect to see the same (nothing changed
> in that file) but instead I see a '-' in the left pane (prev revision)
> and a gap in the WC, which implies that I deleted a line in the WC
> rather than adding one.

And another more serious one, probably related. TMerge is not
detecting conflicts now when it applies a patch. Recipe using the same
test WC in the doc folder. It starts out in a conflicted state when
you generate it.

1. Revert 'docs' to clear the conflict and update both 'doc' and 'docs' to HEAD.
2. In 'doc' add a blank line to dug_export.xml, say between 2 paragraphs.
3. Commit 'doc'
4. In 'docs' add a line with some text in the same place.
5. Create a patch from 'docs'
6. Apply the patch to 'doc'. No conflicts are shown.
7. Go back and update 'docs' to prove that there really is a conflict.

Simon

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