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

Hide all messages in topic

All messages in topic

Re: TortoiseMerge patch strips trailing line

Author Kim Gräsman <kim dot grasman at gmail dot com>
Full name Kim Gräsman <kim dot grasman at gmail dot com>
Date 2012-05-08 01:41:58 PDT
Message Hi Jean-Marc,

On Tue, May 8, 2012 at 9:14 AM, Jean-Marc van Leerdam
<j.m.van.leerdam@​gmail.com> wrote:
>
>> How setup-sensitive are the components in general? Could I unzip
>> binaries on top of my existing TMerge installation, or do they need
>> COM registration, etc?
>
> TSVN is a shell extension and needs a proper installation procedure to work
> correctly. TMerge is no longer a separate application and AFAIK can only be
> installed by installing TSVN.

OK, I see.

Thanks,
- Kim

Re: TortoiseMerge patch strips trailing line

Author jeanmarc
Full name Jean-Marc van Leerdam
Date 2012-05-08 00:14:25 PDT
Message Hi,

On 8 May 2012 06:42, Kim Gräsman <kim dot grasman at gmail dot com> wrote:

> Hi Simon,
>
> On Mon, May 7, 2012 at 10:58 PM, Simon Large
> <simon.tortoisesv​n@gmail.com> wrote:
> >>
> >> 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.
>
> I see, thanks!
>
> How setup-sensitive are the components in general? Could I unzip
> binaries on top of my existing TMerge installation, or do they need
> COM registration, etc?
>
> TSVN is a shell extension and needs a proper installation procedure to
work correctly. TMerge is no longer a separate application and AFAIK can
only be installed by installing TSVN.

--
Regards,

Jean-Marc
Attachments

Re: TortoiseMerge patch strips trailing line

Author Kim Gräsman <kim dot grasman at gmail dot com>
Full name Kim Gräsman <kim dot grasman at gmail dot com>
Date 2012-05-07 21:42:52 PDT
Message Hi Simon,

On Mon, May 7, 2012 at 10:58 PM, Simon Large
<simon.tortoisesv​n@gmail.com> wrote:
>>
>> 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.

I see, thanks!

How setup-sensitive are the components in general? Could I unzip
binaries on top of my existing TMerge installation, or do they need
COM registration, etc?

- Kim

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

Re: TortoiseMerge patch strips trailing line

Author Kim Gräsman <kim dot grasman at gmail dot com>
Full name Kim Gräsman <kim dot grasman at gmail dot com>
Date 2012-05-07 04:46:17 PDT
Message 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?

Thanks,
- Kim

On Fri, May 4, 2012 at 1:16 PM, Kim Gräsman <kim dot grasman at gmail dot com> wrote:
> Hi all,
>
> I just noticed that applying a patch through TortoiseMerge strips
> trailing blank lines from the target files.
>
> For example, I have a file a.txt, committed to SVN;
>
> --
> This is a.txt.
> Its last line is blank.
>
> --
>
> I make a change to a.txt, generate a patch with svn diff and then
> revert my local changes;
>
> --
> This is a.txt.
> some change
> Its last line is blank.
>
> --
>
> $ svn diff a.txt > change.patch
> $ svn revert a.txt
>
> Now I use TortoiseMerge to re-apply change.patch to a.txt.
> Unfortunately my trailing blank line disappears. Here's a.txt after
> patching:
>
> --
> This is a.txt.
> some change
> Its last line is blank.
> --
>
> I'm using TortoiseMerge standalone, version TortoiseMerge 1.6.7, Build
> 18415 - 32 Bit , 2010/01/22 17:55:06.
>
> I would expect it to preserve trailing blank lines, as that seems to
> be considered good style by a number of tools. SVN diff even complains
> "No newline at end of file" after applying the patch.
>
> Is this a bug or am I misusing something?
>
> Thanks,
> - Kim

TortoiseMerge patch strips trailing line

Author Kim Gräsman <kim dot grasman at gmail dot com>
Full name Kim Gräsman <kim dot grasman at gmail dot com>
Date 2012-05-04 04:16:20 PDT
Message Hi all,

I just noticed that applying a patch through TortoiseMerge strips
trailing blank lines from the target files.

For example, I have a file a.txt, committed to SVN;

--
This is a.txt.
Its last line is blank.

--

I make a change to a.txt, generate a patch with svn diff and then
revert my local changes;

--
This is a.txt.
some change
Its last line is blank.

--

$ svn diff a.txt > change.patch
$ svn revert a.txt

Now I use TortoiseMerge to re-apply change.patch to a.txt.
Unfortunately my trailing blank line disappears. Here's a.txt after
patching:

--
This is a.txt.
some change
Its last line is blank.
--

I'm using TortoiseMerge standalone, version TortoiseMerge 1.6.7, Build
18415 - 32 Bit , 2010/01/22 17:55:06.

I would expect it to preserve trailing blank lines, as that seems to
be considered good style by a number of tools. SVN diff even complains
"No newline at end of file" after applying the patch.

Is this a bug or am I misusing something?

Thanks,
- Kim
Messages per page: