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

Re: [TSVN] empty lines added by TMerge

From: SteveKing <stefankueng_at_gmail.com>
Date: 2004-09-22 12:56:00 CEST

On Wed, 22 Sep 2004 12:47:29 +0200, Roel Harbers <roel@roelharbers.nl> wrote:
> TMerge sometimes seems to add empty lines (that are not in either
> "theirs" or "yours") to merged files.
>
> Reproduction recipe:
[snip]
> So, 3 empty lines that were in neither version of the file have been
> added. The only way to prevent it seems to be to select only the first
> row, do "theirs before yours", and then "use yours" on the other lines.
> However, this will put them in the wrong order, depending on which you
> choose:

If the lines are marked as "empty" in TME then they won't be saved,
they're just shown in TME...

Stefan

-- 
       ___
  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 Wed Sep 22 14:05:44 2004

This is an archived mail posted to the TortoiseSVN Dev mailing list.