On 15 Mar 2001, Lars Gullik Bjønnes wrote:

> John Levon <[EMAIL PROTECTED]> writes:
> 
> 
> | which break patch
> 
> so you are saying that this breaks patch:
> 
> Index: MAINTAINERS
> ===================================================================
> RCS file: MAINTAINERS
> diff -N MAINTAINERS
> --- /dev/null Tue May  5 22:32:27 1998
> +++ MAINTAINERS       Thu Mar 15 12:36:57 2001
> @@ -0,0 +1,3 @@
> +Mathed
> +André Pönitz
> [EMAIL PROTECTED]
> 

Try this with a file in a subdirectory !

> +++ src/mathed/array.C        2001/03/15 11:39:54
> @@ -14,7 +14,6 @@
>  using std::ostream;
>  using std::endl;
>  
> -// Is this still needed? (Lgb)
>  static inline
>  void * my_memcpy(void * ps_in, void const * pt_in, size_t n)
>  {

patches that aren't new/deleted files aren't affected by the problem

> I think you belive it breaks because you are either diffing in the
> wrong dir or patching in the wrong dir.

bzzt

I "believe it breaks" because it does break. Ask JMarc about my old patches
that didn't apply properly. It was because of this problem.

Any new/deleted file in a subdirectory is not handled properly, hence the need
for the script.

I can stop using the script if you want but I don't think anyone will appreciate
them having to tidy up ;)

Now it may be my version of cvs or something but you can't just pretend there isn't
a problem. I've attached the unfixed version of my intl.diff so you can see exactly
what I mean

john

-- 
"24-hour boredom
I'm convicted instantly"
        - Manic Street Preachers

a.diff.gz

Reply via email to