Re: log format for vc-bzr

[Thien-Thi Nguyen]

() Ó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

   --commit-the-source-changes-but-do-not-create-a-merge-point

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

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

thi