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

[Marius Kruger]

On 12/19/06, Martin Pool <mbp at canonical.com> wrote:
>
> 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
>



yip
and I even go so far as aliasing my diff to ignore whitespace (in
~/.bazaar/bazaar.conf):
diff = lessdiff --diff-options "--strip-trailing-cr -wp -u10"

note this will only work for bzr.dev, as my alias quoting stuff was merged
after
the latests release.




-- 

whitespace is overrated
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20061219/df91933b/attachment.htm