Excess data size for a single revision

Glenn Morris rgm at gnu.org
Tue Jan 24 21:57:41 UTC 2012

Eli Zaretskii wrote:

> In any case, merging both from trunk to branch and back is not a good
> idea, as the example of copyright changes demonstrates.

That isn't really what happened. I'd already updated the trunk under the
assumption that the emacs-23 branch was dead, then it was decided to
make another release from that branch and I was asked to make the same
change there [1]. Since we have already established that there is no
other way to do the merge emacs-23 -> trunk, there is literally no other
way this could have been done.

Nobody else seems particularly interested in either of these tedious
jobs (updating years, merging between branches) so I did them to the
best of my abilities.

Anyway, I don't think this is on-topic for the bazaar list...

[1] Except it's not literally the same change because the notices have
different formats in the two branches. I tried it last year making the
change in emacs-23 then merging it trunk, and it was a huge PITA
resolving conflicts in thousands (literally) of files.
So I would not have done it that way this year even had I known in
advance that I would have to do it on two branches. Sorry, 28.8k modem

More information about the bazaar mailing list