[sage-devel] Re: Patches with fuzz

2011-08-01 Thread Volker Braun
On Monday, August 1, 2011 4:12:12 PM UTC+1, jason wrote: > > Pardon my ignorance, but what does "fuzz n" mean and how is it different > for different values of n? > Let me quote "man patch": With context diffs, and to a lesser extent with normal diffs, patch can detect when

[sage-devel] Re: Patches with fuzz

2011-08-01 Thread Jason Grout
On 8/1/11 3:08 AM, Jeroen Demeyer wrote: Sometimes, it can happen that a patch only applies with "fuzz", for example: $ hg import http://trac.sagemath.org/sage_trac/raw-attachment/ticket/11298/trac11298_singular_standard_options.rebase4.7.1.a1.patch patching file doc/en/reference/misc.rst Hunk #

[sage-devel] Re: Patches with fuzz

2011-08-01 Thread Simon King
Hi! On 1 Aug., 12:08, Jeroen Demeyer wrote: > Sometimes, it can happen that a patch only applies with "fuzz", for example: > > $ hg > importhttp://trac.sagemath.org/sage_trac/raw-attachment/ticket/11298/trac11... > patching file doc/en/reference/misc.rst > Hunk #1 succeeded at 10 with fuzz 2 (of

[sage-devel] Re: Patches with fuzz

2011-08-01 Thread Volker Braun
On Monday, August 1, 2011 11:08:28 AM UTC+1, Jeroen Demeyer wrote: > > My personal opinion on applying patches with fuzz is that I allow > patches with fuzz 1 but not with fuzz 2. > There is no guaranteed safe way of dealing with fuzzy patches. I think your position is reasonable. Ideally, the pa