From: Eli Zaretskii <eliz@gnu.org>
To: "Stephen J. Turnbull" <stephen@xemacs.org>
Cc: ofv@wanadoo.es, emacs-devel@gnu.org
Subject: Re: log format for vc-bzr
Date: Fri, 08 Jan 2010 14:20:06 +0200 [thread overview]
Message-ID: <838wc8bxft.fsf@gnu.org> (raw)
In-Reply-To: <873a2gkh0n.fsf@uwakimon.sk.tsukuba.ac.jp>
> From: "Stephen J. Turnbull" <stephen@xemacs.org>
> Cc: =?iso-8859-1?Q?=D3scar?= Fuentes <ofv@wanadoo.es>,
> emacs-devel@gnu.org
> Date: Fri, 08 Jan 2010 19:50:00 +0900
>
> Eli Zaretskii writes:
>
> > --forget-merges
> > Remove pending merge marker, without changing any files.
> >
> > What is a ``pending merge marker''?
>
> A "pending merge" is a merge that you have started with "bzr merge"
> (or perhaps a "bzr pull" that resulted in a conflict) but not yet
> finished with "bzr commit".
Terrific! So I just did a merge, but it is still considered
``pending''? Who could have thought of a more confusing semantics??
(Please don't take this as aimed at you, Stephen; I will shortly say
the same on the Bazaar list.)
> > And how removing it resolves the problem at hand?
>
> By removing the pointer to the parents in the microbranch along with
> the merge marker, the history (metadata) recorded in the microbranch
> becomes inaccessible (in Lisp terms, garbage).
What is a microbranch?
> The "real" history (files changed by the merge operation) is not
> touched, and so the content changes, but not the historical
> metadata, is recorded in the upcoming commit.
So it's a way to pretend that a series of changes on a branch is a
single change that brings you to the last revision on that branch, is
that right?
If so, then I think it's not what I thought it would do. This
sub-thread started from ttn's comment that "Unrestrained publishing of
personal junk is bad manners." But ``personal junk'' can only be in
the commit messages, much less in the code. (It could, of course,
happen that I somehow commit a version with lots of debug printouts or
some such, but how is that ``personal junk''?) "revert --forget-merges"
forgets the whole commit, not just its commit message, so it seems to
throw out the baby with the bathwater.
Or am I missing something?
Anyway, thanks for the explanations.
> > 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?
>
> It's a wiki ....
Yes, but it states a policy, so I won't want to make such changes
unless they are agreed to.
next prev parent reply other threads:[~2010-01-08 12:20 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-08 17:47 log format for vc-bzr Dan Nicolaescu
2009-12-08 19:19 ` Óscar Fuentes
2009-12-08 19:47 ` Andreas Schwab
2009-12-08 20:15 ` Óscar Fuentes
2009-12-08 21:10 ` Andreas Schwab
2009-12-08 22:03 ` Dan Nicolaescu
2009-12-08 22:36 ` Óscar Fuentes
2009-12-09 0:27 ` Jason Earl
2009-12-09 8:55 ` Andreas Schwab
2009-12-09 9:55 ` Stephen J. Turnbull
2009-12-09 14:41 ` Stefan Monnier
2009-12-09 20:29 ` Óscar Fuentes
2009-12-09 21:49 ` Andreas Schwab
2009-12-09 22:34 ` Óscar Fuentes
2009-12-09 23:15 ` Andreas Schwab
2009-12-10 2:03 ` Stephen J. Turnbull
2009-12-10 9:12 ` Andreas Schwab
2009-12-10 12:28 ` Stephen J. Turnbull
2010-01-07 21:23 ` Thien-Thi Nguyen
2010-01-07 21:47 ` Óscar Fuentes
2010-01-08 0:40 ` Thien-Thi Nguyen
2010-01-08 9:00 ` Eli Zaretskii
2010-01-08 10:09 ` reversion revulsion [was: log format for vc-bzr] Thien-Thi Nguyen
2010-01-08 10:53 ` Juanma Barranquero
2010-01-08 13:41 ` reversion revulsion Thien-Thi Nguyen
2010-01-08 14:32 ` Juanma Barranquero
2010-01-08 14:47 ` Thien-Thi Nguyen
2010-01-08 11:21 ` reversion revulsion [was: log format for vc-bzr] Óscar Fuentes
2010-01-08 12:36 ` Eli Zaretskii
2010-01-08 13:27 ` reversion revulsion Óscar Fuentes
2010-01-08 16:54 ` Eli Zaretskii
2010-01-08 17:57 ` Óscar Fuentes
2010-01-08 13:29 ` reversion revulsion [was: log format for vc-bzr] Juanma Barranquero
2010-01-08 13:32 ` Juanma Barranquero
2010-01-08 10:28 ` log format for vc-bzr Juanma Barranquero
2010-01-08 12:01 ` Eli Zaretskii
2010-01-08 12:24 ` Juanma Barranquero
2010-01-08 12:52 ` Eli Zaretskii
2010-01-08 13:22 ` Juanma Barranquero
2010-01-08 13:50 ` Andreas Schwab
2010-01-08 14:28 ` Juanma Barranquero
2010-01-08 14:39 ` Thien-Thi Nguyen
2010-01-08 17:56 ` bzr Q&A [was Re: log format for vc-bzr] Glenn Morris
2010-01-09 10:35 ` Eli Zaretskii
2010-01-09 17:58 ` Stephen J. Turnbull
2010-01-08 10:50 ` log format for vc-bzr Stephen J. Turnbull
2010-01-08 12:20 ` Eli Zaretskii [this message]
2010-01-08 12:29 ` Juanma Barranquero
2010-01-08 13:39 ` Stephen J. Turnbull
2010-01-09 10:51 ` Eli Zaretskii
2010-01-08 13:48 ` Óscar Fuentes
2010-01-08 16:57 ` Eli Zaretskii
2010-01-08 17:45 ` Óscar Fuentes
2010-01-08 19:35 ` Eli Zaretskii
2010-01-08 19:41 ` Miles Bader
2010-01-08 21:22 ` Eli Zaretskii
2010-01-08 20:46 ` Óscar Fuentes
2010-01-08 21:29 ` Eli Zaretskii
2010-01-08 21:51 ` Óscar Fuentes
2010-01-08 22:24 ` Eli Zaretskii
2010-01-08 23:05 ` Óscar Fuentes
2010-01-09 8:50 ` Thien-Thi Nguyen
2010-01-09 9:36 ` Andreas Schwab
2010-01-09 13:35 ` Thien-Thi Nguyen
2010-01-09 3:45 ` Miles Bader
2010-01-08 11:54 ` Daniel Clemente
2010-01-08 16:45 ` Eli Zaretskii
2010-01-09 3:18 ` Daniel Clemente
2010-01-09 9:37 ` Eli Zaretskii
2009-12-09 1:32 ` Stefan Monnier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=838wc8bxft.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=ofv@wanadoo.es \
--cc=stephen@xemacs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.