[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-20 18:25:37 CEST

Simon Large wrote:
> On 19/07/07, Simon Large <simon.tortoisesvn@googlemail.com> wrote:
>> 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.
> The MakeTest.bat program now creates a patch file with conflicts. But
> strangely this one works. The example above still fails, maybe
> something to do with a single line conflict?
> Oh, what now? I'm getting a crash in TMerge when I try to apply the
> attached patch to 'doc' or 'docs' after (1) above. Time to get some
> sleep ;)

That's why they're called nightly builds - pretty unstable, needs testing :)
Fixed in revision 10186.


   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 Fri Jul 20 18:24:48 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.