[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] Something wrong with mtn diff, with changes close t
|
From: |
Thomas Moschny |
|
Subject: |
Re: [Monotone-devel] Something wrong with mtn diff, with changes close to beginning of file? |
|
Date: |
Thu, 12 Apr 2007 21:39:00 +0200 |
|
User-agent: |
KMail/1.9.6 |
On Thursday 12 April 2007, Zack Weinberg wrote:
> > @@ -1,12 +1,14 @@ DSAP_Lsnr.o : ../../../../h/isode/asn1/I
>
> ...
>
> > @@ -4,9 +4,11 @@
>
> I think the problem is here. There should be exactly the same number
> of lines of leading and trailing context.
Monotone's diff seems to create too much context. The context spec itself
seems to be consistent, only GNU patch doesn't like hunks with that many
context lines.
Two more observations:
- Monotone's diff seems to produce such hunks only for diffs near the
beginning of a file.
- They can (sometimes?) be applied by giving the -F3 option to patch.
--
Thomas Moschny <address@hidden>
pgpeaKwz7W2Ay.pgp
Description: PGP signature