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

Re: TortoiseMerge /Create-Apply patch issues

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 19 May 2011 21:27:44 +0200

On 18.05.2011 23:27, zaf646 wrote:
> I'm using the nightly builds, atm TortoiseSVN 1.6.99, Build 21396 - 32
> Bit -dev, 2011/05/17 21:18:02.
>
> Here are a couple of issues I have noticed with TortoiseMerge:
>
> 1) Whenever I apply a patch, I get a window poping up saying that some
> files have been changed outside T-Merge (which I believe should be
> "ToirtoiseMerge" for consistency). Isn't it obvious, that since I
> apply a patch the file will be changed? Can't this case be handled
> differently, i.e. by not showing that popup window at all? If I choose
> reload then the changes are gone, I can't see what the patch file has
> changed (no highlighting of the modifications).

Fixed in r21408.

> 2) If a patch includes new files, then those are not automatically
> added in the svn anymore. This started to happen lately, not sure at
> which revision though.

Should be fixed in r21410: it worked ok when saving the file with the
'save' button, but failed to work if you used 'patch all'.

> 3) If a patch contains whole file deletions then the deleted files are
> not marked as deleted in the svn.

That however still works ok for me. Are you sure the resulting file is
completely empty?
Ok, the file is not removed with 'svn rm' but only removed. But svn will
show that file as 'missing'.

> 4) When I open the create patch dialog I notice an "Options" button
> showing and then going away when the files are loaded in the dialog.
> It's like it's not anchored in the right place.

Fixed in r21409.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2741509
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-05-19 21:27:51 CEST

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