Re: log format for vc-bzr

[Eli Zaretskii]

> From: Óscar_Fuentes <address@hidden>
> Date: Thu, 07 Jan 2010 22:47:01 +0100
> 
> Thien-Thi Nguyen <address@hidden> writes:
> 
> >    Well, we will see *lots* of history entries like that.
> >
> >    It is a byproduct of the distributed workflow. An insignificant one,
> >    because you are not supposed to look into the merge histories of
> >    microbranches. That's why bzr defaults to not showing merged histories.
> >
> > I would rather not discourage curiosity, but instead, bad manners.
> > Unrestrained publishing of personal junk is bad manners.
> 
> bzr revert --forget-merges
> 
> allows to commit into microbranches as one pleases and leave a nice
> corpse afterwards.

As usual, the Bazaar documentation doesn't say anything about this
option that can be grokked by Bazaar non-experts.

    --forget-merges 
      Remove pending merge marker, without changing any files.

What is a ``pending merge marker''?  And how removing it resolves the
problem at hand?  And if this is the magic wand to leave personal
commit comments out of the public repository, then shouldn't we add
this to the recommended workflow on the wiki?