[MERGE] Diff now emits files in alphabetical order
Andrew Bennetts
andrew at canonical.com
Tue Dec 18 04:45:51 GMT 2007
Aaron Bentley wrote:
> Hi all,
>
> Here's an update to diff that causes it to emit files in alphabetical
> order, instead of grouping them by change kind.
bb:comment
(I haven't looked at the code yet, just commenting on the advertised
functionality.)
In some ways I think I actually prefer the current order. Perhaps it's just
that I'm used to it, but for instance having deleted files at the end of the
diff means I know I can ignore the detail of the diff from that point on,
because I know that it will consist of just deleting lines.
Ideally, for bzr development at least, I'd like to see diff emit files in this
order:
- doc/*
- bzrlib/tests/*
- everything else
i.e. put the bits that explain what the code is supposed to do first.
Of course, this change isn't really any better or worse in that respect
(although I guess it will tend to put doc/ first), so personally I'm neutral on
changing from grouped by changed kind to alphabetical by name. I guess there's
been some user interest in alphabetical ordering?
I'm mildly surprised there's no “sortdiff” in the patchutils package :)
-Andrew.
More information about the bazaar
mailing list