[Top][All Lists]

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

Re: Confusing "bzr log" as result of merges

From: Eli Zaretskii
Subject: Re: Confusing "bzr log" as result of merges
Date: Sat, 21 May 2011 16:04:41 +0300

> Date: Sat, 21 May 2011 13:38:50 +0300
> From: Eli Zaretskii <address@hidden>
> > Date: Sat, 21 May 2011 10:33:09 +0300
> > From: Eli Zaretskii <address@hidden>
> > 
> > What can we do to avoid this confusion as result of merges?  And why
> > was 99634.2.937 merged to the trunk, even though the log message
> > clearly says it's a backport?  If we avoid merging such backported
> > revisions, will this problem go away?
> On second thought, maybe it's my fault, in that I merged from trunk to
> emacs-23, instead of just copying the code?  Should we refrain from
> merging from trunk to emacs-23, to avoid such confusion?

On third thought, this seems to be an artifact of how we merge from
emacs-23.  I already complained about this in the past, see


In that discussion, we agreed to mention in the commit message the
versions that were reverse cherry-picked.  But it looks like that
agreement was never acted upon.

reply via email to

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