[Top][All Lists]

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

Re: log format for vc-bzr

From: Óscar Fuentes
Subject: Re: log format for vc-bzr
Date: Fri, 08 Jan 2010 18:45:07 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.90 (gnu/linux)

Eli Zaretskii <address@hidden> writes:

>> > Terrific!  So I just did a merge, but it is still considered
>> > ``pending''?  Who could have thought of a more confusing semantics??
>> bzr always requires to commit after a merge.
> Then the docs should have said "pending uncommitted merge results".
> IOW, the fact that there should be a commit after the merge is not the
> reason to call the just-performed merge "pending".  The results of the
> merge are pending commit, but the merge itself is no longer pending,
> it was already done.

I disagree. The pending is not done until the corresponding revision is
created and hence integrated on the history of the branch. That revision
is the merge, not the source code changes that `bzr merge' created.

This is a about how to interpret certain terms. You are seeing the issue
from the POV of a code writer who cares mostly about the state of the
working tree. Me from the POV of somebody who is more fluent with the
tool (bzr) and see things on terms of history points.


reply via email to

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