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

Re: TortoiseSVN "apply patch" fails when "patch -p0" succeeds

From: Ben Voigt <richardvoigt_at_gmail.com>
Date: Mon, 25 Aug 2008 16:32:01 -0700 (PDT)

On Aug 25, 4:07 pm, Stefan Küng <tortoise..._at_gmail.com> wrote:
> Ben Voigt wrote:
> > Are there any plans to add the usual patch capability of matching the
> > contextual lines included in a unified diff to the "apply patch"
> > function in TortoiseSVN?  Patches that TortoiseMerge would have no
> > trouble with (in three-way merge mode) are rejected by the "apply
> > patch" function of TortoiseSVN / the "apply unified diff" function of
> > TortoiseMerge.
>
> > Some control over created patch/diff files would be nice too (number
> > of lines of context, include whitespace or not, etc).
>
> Currently there are no plans to implement something like this. But
> Subversion will soon have its own patch command which TSVN will of
> course make use of - that patch will also handle renames and binary files.

Waiting for a promised change upstream is reasonable enough. I guess
I'll just have to test whether the future libsvn version supports fuzz
matching and so forth.

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

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-08-26 01:48:30 CEST

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