Re: Bzr taskbranches and ChangeLog

[Tassilo Horn <tsdh@gnu.org>]

Eli Zaretskii <eliz@gnu.org> writes:

>> It doesn't seem to work as advertised here.  I have put
>> 
>>   [/home/horn/Repos/el/emacs/]
>>   changelog_merge_files = ChangeLog
>> 
>> in my ~/.bazaar/locations.conf and updated my trunk and merged into
>> my taskbranch, but now the ChangeLog entries I have received from the
>> trunk are on top of my own entry whereas it should be the other way
>> round.
>
> That's what this plugin is supposed to do, since your entries
> "arrived" in that branch before the merged ones.

Yes, now I got it.

> There's no better strategy in the general case, when there are changes
> in ChangeLog not only at the top.  And when you merge to your bound
> branch, the result will be exactly right: your entries will be at the
> top.
>
> As I mentioned in my other mail, you need to move your entries to the
> top of the file before committing upstreams.

I'll do so, and in the future I'm going to use the "write ChangeLog
only before publishing upstream" tactics.

>> Now the result is that "bzr missing" tells me that I have 2 extra
>> revisions and no missing ones.  However, "bzr log" doesn't show me
>> the commits I've just merged, but the changes are here.  The commits
>> seem to be amalgamated in the merge commit that's on top of the log
>> right now.  Is that how it is supposed to be?
>
> Yes.  By default, "bzr log" hides all the individual commits on
> another branch that you merged, and shows only a single merge commit.
> To see the revisions from another branch, do "bzr log -n0" or "bzr log
> --include-merged".

Ah, thanks.

Bye,
Tassilo