[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Line numbering error in TMerge

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2005-12-06 19:56:14 CET

Simon Large wrote:
> Hi Stefan,
> When resolving a conflict in TMerge with Theirs before Mine (Thomas
> Borkel's example), the line numbering gets corrupted. The numbers seem
> to be fairly random, and I don't think it depends on whitespace settings
> this time.
> Observed in r5039.


The line numbers aren't changed in the result window - they're the line
numbers of the original views.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Dec 6 19:57:20 2005

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.