Login | Register
My pages Projects Community openCollabNet

Discussions > users > Re: TortoiseMerge patch strips trailing line

Project highlights: :. Download .: :. Support .: :. FAQ .: :. Translations .: :. Donate .: :. Report Bug .:

tortoisesvn
Discussion topic

Back to topic list

Re: TortoiseMerge patch strips trailing line

Author simonlarge
Full name Simon Large
Date 2012-05-07 13:58:36 PDT
Message On 7 May 2012 12:46, Kim Gräsman <kim dot grasman at gmail dot com> wrote:
> Hello,
>
> We tried this on a colleague's machine, but via TortoiseSVN 1.6.16's
> "Apply patch" command, and didn't see the problem.
>
> I'm using TortoiseMerge from here:
> http://sourceforge.n​et/projects/tortoise​svn/files/Tools/1.6.​7/
>
> Could it be that this is fixed in later revs of TortoiseSVN, but just
> not released as a standalone TortoiseMerge?

That's one very old version of TMerge you're using. We're on 1.7.6
now. You cannot download it as a separate file though, only as part of
TortoiseSVN. It just became too much work to maintain multiple
installers, and as of 1.7.0 all components of TortoiseSVN use DLLs
instead of static linking, so separate installers are no longer
sensible anyway.

Simon

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

« Previous message in topic | 3 of 6 | Next message in topic »

Messages

Show all messages in topic

TortoiseMerge patch strips trailing line Kim Gräsman <kim dot grasman at gmail dot com> Kim Gräsman <kim dot grasman at gmail dot com> 2012-05-04 04:16:20 PDT
     Re: TortoiseMerge patch strips trailing line Kim Gräsman <kim dot grasman at gmail dot com> Kim Gräsman <kim dot grasman at gmail dot com> 2012-05-07 04:46:17 PDT
         Re: TortoiseMerge patch strips trailing line simonlarge Simon Large 2012-05-07 13:58:36 PDT
             Re: TortoiseMerge patch strips trailing line Kim Gräsman <kim dot grasman at gmail dot com> Kim Gräsman <kim dot grasman at gmail dot com> 2012-05-07 21:42:52 PDT
                 Re: TortoiseMerge patch strips trailing line jeanmarc Jean-Marc van Leerdam 2012-05-08 00:14:25 PDT
                     Re: TortoiseMerge patch strips trailing line Kim Gräsman <kim dot grasman at gmail dot com> Kim Gräsman <kim dot grasman at gmail dot com> 2012-05-08 01:41:58 PDT
Messages per page: