[Top][All Lists]

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

Re: Confusing "bzr log" as result of merges

From: Stefan Monnier
Subject: Re: Confusing "bzr log" as result of merges
Date: Mon, 23 May 2011 09:02:37 -0300
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux)

>> > tool.  The discrepancy here happens because bzrmerge.el plays unholy
>> > games with the metadata as opposed to the sources.  If we need to do
>> You are confused: the metadata resulting from bzrmerge.el is 100%
>> identical to the metadata resulting from "bzr merge".
> I don't think I'm confused that much: I said "metadata as opposed to
> the sources".

Merging with bzrmerge.el instead of with "bzr merge" should result in
an absolutely identical result, except for the fact that the guy doing
the merge will have to do a bit less work.


reply via email to

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