Code review comment for lp://staging/~nmb/bzr/fix-481526

>>>>> "Neil" == Neil Martinsen-Burrell <email address hidden> writes:

    Neil> Is that sorted lexicographically?

Yes.

    Neil> Should I be merging bzr.dev frequently to my branches
    Neil> in order to get the up to date NEWS entries so that I
    Neil> can sort mine into the list correctly?

When I start working on a bug, I generally do:

  bzr branch lp:bzr <bug number>-<short-bug-description>

So I always have a pretty decent NEWS file. The later you start
your branch, the less conflicts you can encounter.

If you want to target the stable release, you start with
lp:bzr/2.0 instead of lp:bzr and since that's a stable branch,
you're less likely to have conflicts :)

    Neil> Is this documented in HACKING.txt?

I honestly can't remember.

    Neil> I understand that NEWS conflicts are a big pain and I'd
    Neil> like to make my patches merge as smoothly as possible,
    Neil> but I'm not sure precisely how I should be doing that.

Not a *big* pain, but when no tweaks at all are required, I can
pqm-submit directly from your branch instead of creating a local
one.

    Neil> My interpretation of what HACKING.txt says is that bug fixes
    Neil> belong in the Bug Fixes section.

Sure, but we also have a 'Documentation' section and we encourage
people to file bugs with the 'doc' tag.

    Neil> I'd be fine leaving these sorts of tweaks out of NEWS
    Neil> entirely, but it has been mentioned on the ML that
    Neil> putting even small bug fixes in NEWS is good for
    Neil> perception.

I think it *is* good to add them.