Re: [Emacs-diffs] /srv/bzr/emacs/trunk r109327: Generalize INTERNAL_FIELD between buffers, keyboards and frames.

[Eli Zaretskii <eliz@gnu.org>]

> From: "Stephen J. Turnbull" <stephen@xemacs.org>
> Date: Thu, 02 Aug 2012 14:56:16 +0900
> Cc: Stefan Monnier <monnier@IRO.UMontreal.CA>, emacs-devel@gnu.org
> 
> For you personally, why don't you talk to Miles (aka Mr. Lexbind) and
> Eli (aka Mr. BIDI) and see if they have some hints for maintaining
> one's own enthusiasm for working on a long-lived branch?

My experience with this is that merging is not a problem at all.  I
just grepp'ed my .bzr.log files for the 2 years I developed bidi on a
branch, and found only 11 conflicts there.  Given that I was merging
from the trunk once a week, this number is all but negligible.

To be fair, I was mainly hacking a single source file (and another one
that didn't exist on the trunk, so it doesn't count).  But the same is
probably true for GC-related work: it mainly affects alloc.c, and
that's it.

So, all in all, I don't understand what's all the fuss about merging
nightmare.  For me, one of the main advantages of bzr (which is common
to all modern dVCSes) is the much smarter merging, with the result
that conflicts are almost non-existent.  I used to be petrified by
merges and branches when I used CVS; now I don't think twice when I
need to make a branch and work on it for a while.

Just try it.