[Top][All Lists]

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

Re: log format for vc-bzr

From: Thien-Thi Nguyen
Subject: Re: log format for vc-bzr
Date: Sat, 09 Jan 2010 09:50:19 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.90 (gnu/linux)

() Óscar Fuentes <address@hidden>
() Sat, 09 Jan 2010 00:05:51 +0100

   At the time you use --forget-merges the merge point still
   doesn't exist. It is created by the commit. So the hypothetical
   name for the option would be more like


It sounds like the naming error (in the option) lies with the verb
"forget", which in the construction "forget X" implies X has already
happened.  If X is from the future, "don't bother to schedule X" is

Another timing error is in the association of the option with the
command "revert", which also has strong (by definition!) implication of
undoing an action in the past.

Really, the distinction the option introduces is between the data
and the metadata.  A "bzr merge" combines both normally, and it is
there that the distinction (the message "combine only the data,
not the metadata") should be moved.  Concretely, the sequence:

  bzr merge
  bzr revert --forget-merges

would be better expressed as:

  bzr merge --data-only  ;; or somesuch

in order to avoid having to wrap one's head around "pre-forgetting".


reply via email to

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