From: "Óscar Fuentes" <ofv@wanadoo.es>
To: emacs-devel@gnu.org
Subject: Re: broken bzr history?
Date: Mon, 01 Mar 2010 07:03:03 +0100 [thread overview]
Message-ID: <87eik4d1ew.fsf@telefonica.net> (raw)
In-Reply-To: jwvaausabi0.fsf-monnier+emacs@gnu.org
Stefan Monnier <monnier@iro.umontreal.ca> writes:
>> Stefan, how did you create that merge revision?
>
> IIRC it was something like:
>
> bzr merge <branch>
> [... inspect bzr diff to make sure there's nothing left unmerged ...]
> bzr revert .
> bzr commit -m <msg>
>
> In any case, it was a stupid idea on my part, and I'm "glad" to see that
> I'll get to regret it some more in the future.
Well, that method was what I used while migrating some svn repos to bzr,
after the bzr developers sanctioned it. I guess that they are not aware
of the effects on `annotate'.
prev parent reply other threads:[~2010-03-01 6:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <201002260126.o1Q1Q6uq008127@memory-leak.sm.sony.co.jp>
[not found] ` <871vg89yve.fsf@mail.jurta.org>
[not found] ` <m2r5o8b9rs.fsf@igel.home>
[not found] ` <87y6ig5mww.fsf_-_@mail.jurta.org>
2010-03-01 1:01 ` broken bzr history? Glenn Morris
2010-03-01 2:20 ` Óscar Fuentes
2010-03-01 4:55 ` Stefan Monnier
2010-03-01 6:03 ` Óscar Fuentes [this message]
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=87eik4d1ew.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).