[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 11:44:46 +0300

> From: Andreas Schwab <address@hidden>
> Cc: address@hidden
> Date: Sat, 21 May 2011 10:36:57 +0200
> Eli Zaretskii <address@hidden> writes:
> > 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?
> A merge always includes all parent revisions.  There is no way to "avoid
> merging a backported revision".

Maybe with git.  With bzr, "merge" accepts a switch that can specify
revisions to merge.

IOW, revision 100577 on the emacs-23 branch could have been omitted
from the merge, because its log message says it's a backport.

reply via email to

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