[Top][All Lists]

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

Re: Confusing "bzr log" as result of merges

From: Óscar Fuentes
Subject: Re: Confusing "bzr log" as result of merges
Date: Sat, 21 May 2011 18:21:57 +0200
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux)

Eli Zaretskii <address@hidden> writes:


> What can we do to avoid this confusion as result of merges?

Avoid cherry-picking. Always do merges.

Create a branch emacs-common and commit there all the changes intended
for emacs-23 and trunk. From time to time *merge* (not cherry-pick!)
emacs-common into emacs-23 and trunk.

Long time ago I advised against mixing cherry-picks and merges and
suggested this strategy, but was discarded because it is too
complex. I'm sure that as time passes and you get bitten again and again
by the current practice it will finally look extremely simple.

reply via email to

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