From: "Óscar Fuentes" <ofv@wanadoo.es>
To: emacs-devel@gnu.org
Subject: Re: reversion revulsion [was: log format for vc-bzr]
Date: Fri, 08 Jan 2010 12:21:02 +0100 [thread overview]
Message-ID: <87d41kdeqp.fsf@telefonica.net> (raw)
In-Reply-To: 87wrzszz4y.fsf_-_@ambire.localdomain
Thien-Thi Nguyen <ttn@gnuvola.org> writes:
> 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?
>
> I'm concerned that mis- (or any, actually) use of "bzr revert"
> in trunk/ (as opposed to in quickfixes/) will do some damage
> upstream, in the sense that any change that discards (shared)
> history is an ugly mistake.
>
> That's just from a correctness pov. I dread the performance
> implications of having to do (and possibly screwing up):
>
> cd .../trunk # 0
> bzr update # 1
> bzr merge ../quickfixes # 2
> bzr commit # 3
> bzr revert --forget-merges # 4
>
> IIUC step 3 publishes, as does step 4, defeating atomicity.
Nope, you have steps 3 and 4 reversed.
`bzr revert' does not modify committed history. Maybe you are
confusing it with `bzr uncommit', which NEVER should be used in trunk/?
> Really, i would be much happier to see "bzr revert" prohibited
> entirely on <http://www.emacswiki.org/emacs/BzrForEmacsDevs>
> or wherever such policy lives, and see local branch history
> suppression effected in step 2 in the merge proper. That is
> where i want to express "merge quickfixes/ changes, allowing
> manual editing of a new comment (log entry) seeded with the
> log entries of the quickfixes/ changes, but in the end
> *discarding* those log entries".
>
> More succinctly: Can bzr do what "git merge --squash" does?
From my careless reading of `git help merge', I think that
bzr merge <something>
bzr revert --forget-merges
does that, or something very similar.
--
Óscar Fuentes
Desarrollo de Software
next prev parent reply other threads:[~2010-01-08 11:21 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 ` Óscar Fuentes [this message]
2010-01-08 12:36 ` reversion revulsion [was: log format for vc-bzr] 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
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87d41kdeqp.fsf@telefonica.net \
--to=ofv@wanadoo.es \
--cc=emacs-devel@gnu.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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).