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

Re: TMerge adding blank lines

From: Stefan KŁng <tortoisesvn_at_gmail.com>
Date: Wed, 18 Jun 2008 18:09:52 +0200

Josha Foust wrote:
> I am seeing TMerge insert blank lines when resolving conflicts in files.
> I think this was mentioned a while back by someone else, but was not
> demonstrated to be reproducible. Here is a reproduction recipe for it.
>
> I'm running TortoiseSVN 1.5.0, Build 13177 on 32bit Win XP SP2.
>
> 1. Create a new file, in what will be called WC1, with the following
> contents and add it to a repo:
> a
> b
> c
> d
> e
> f
> g
> h
> i
> j
> 2. Modify that file in WC1 by adding the following between d and e.
> 1
> 2
> 3
> 4
> 5
> 3. Checkout another copy of that file in WC2
> 4. Add an "A" on a blank line between d and e.
> 5. Commit the file in WC1.
> 6. Update WC2 and launch TMerge to resolve the conflict.
> 7. Click Next Conflict, Use "mine" text block, Mark as resolved.
>
> You end up with a 4 blank lines between A and e. This does not seem
> like desired behavior.

Thanks for the report and the recipe.
Fixed in r13293.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net

Received on 2008-06-18 18:10:20 CEST

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