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

Re: TortoiseMerge problem with Power Shell scripts

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 27 Jul 2012 18:25:47 +0200

On 27.07.2012 18:05, John Cambray wrote:
> I have found an issue where TortoiseMerge will not display diffs for
> Power Shell scripts. If a power shell script is created by the PS ISE
> the file format is such that TortoiseMerge does not recognize it.
> There is workaround though so I don't know whether a bug should be
> created or not. I am really posting this so if someone else runs into
> this problem they may find this post for the workaround. The
> workaround is fairly simple. I just made sure I had exited the Power
> Script ISE and then I ran a unix2dos on the file and now
> TortoiseMerge can display the text in the file. This only has to be
> done once in that PS ISE leaves the file format alone on subsequent
> edits and saves. (So does VIM)

Can you send two example files to illustrate the problem?


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-07-27 18:25:55 CEST

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.