[Top][All Lists]

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

Re: Confusing "bzr log" as result of merges

From: Sven Joachim
Subject: Re: Confusing "bzr log" as result of merges
Date: Sat, 21 May 2011 11:01:13 +0200
User-agent: Gnus/5.110017 (No Gnus v0.17) Emacs/23.3.50 (gnu/linux)

On 2011-05-21 10:44 +0200, Eli Zaretskii wrote:

>> 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.

The downside of that is that bzr then does not track what revisions have
already been merged.  At least, that's what
http://wiki.bazaar.canonical.com/MergeTracking says about that topic.


reply via email to

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