[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-20 22:45:13 CEST

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

Thanks for fixing that. This has turned into quite a long thread, and
I reported several different problems, not sure if they are all
covered here:

Diff/conflict detection behaves differently on last line of a file.
+ / - seems to be the wrong way round.
Conflicts are sometimes shown where none exists.


  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 22:44:15 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.