[RFC/MERGE] Avoid syncing on incorrect lines during diff

Martin Pool mbp at canonical.com
Tue Dec 19 08:08:25 GMT 2006

On 19/12/2006, at 6:56pm, Alexander Belchenko wrote:

> Yesterday my co-worker ask me what option of diff command could  
> produce
> output that ignore whitespace changes. I say -- there is no such  
> option.
> Today John write a patch. Amazing.


But I don't think this patch does quite what your coworker wants,  
since this still considers those lines different.  It just changes  
the alignment points in the diff to make them (we hope) better align  
with intention.

If you have gnu diff installed, you can get what they want with

   bzr diff --diff-options -w

it might be nice to have built in though.  Also we should add a short  
option for --diff-options.


More information about the bazaar mailing list