[Zope-dev] Collector Status Update

Tres Seaver tseaver@palladion.com
Tue, 11 Apr 2000 20:05:56 -0500


Anthony Baxter wrote:
> 
> > I therefore added a shiny new "Patch" field, and will work on migrating
> > those bugs/features with patches to move the patch.  In the future, please
> > stuff actual patches into this field (use 'diff -c' by preference).
> 
> not 'diff -u'? they're smaller, and easier to read...

I'm actually agnostic on the "unified" vs. "context" flamewar -- I'll take
either in preference to a "plain" diff, and all three in preference to no diff
at all.  I'm following the Python "party-line" here: 

  http://www.python.org/patches/

I believe that the rationale for preferring context diffs is that they make
manual conflict resolution simpler.

Tres.
-- 
=========================================================
Tres Seaver  tseaver@digicool.com   tseaver@palladion.com