[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Incorrect merge

From: Óscar Fuentes
Subject: Re: Incorrect merge
Date: Wed, 03 Nov 2010 07:46:06 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux)

"Stephen J. Turnbull" <address@hidden> writes:


> Your way requires all committers who fix bugs to worry about which
> branch to commit to.

Yes, exactly as it happens right now.

Maybe you didn't notice that people commit to emacs-23 (and to emacs-23
only) whenever the fix applies to that release, and to trunk only
otherwise. Then, from time to time, some maintainer merges (or, more
precisely, cherry picks) emacs-23 into trunk. This means that people
already need to figure out where to commit their fixes. Replacing
emacs-23 with common-fixes here seems a tiny change on the workflow to
me, much less burdensome than waiting for the availability and using a
script that fakes cherry-pick tracking on bzr.

(Good luck writing that script. It looks much harder to do than on the
svn case, if possible at all without extending the repository format.)

reply via email to

[Prev in Thread] Current Thread [Next in Thread]