From: Colin Watson <cjwatson@ubuntu.com>
To: The development of GNU GRUB <grub-devel@gnu.org>
Subject: Re: fb rotation merge directive
Date: Tue, 19 Jan 2010 11:53:18 +0000 [thread overview]
Message-ID: <20100119115318.GC5847@riva.ucam.org> (raw)
In-Reply-To: <a5d587fb1001190344k1b21093ch13dbf0d11005f9b0@mail.gmail.com>
On Tue, Jan 19, 2010 at 12:44:18PM +0100, Michal Suchanek wrote:
> 2010/1/19 Colin Watson <cjwatson@ubuntu.com>:
> > lp:~jelmer/bzr-rewrite/trunk-mirrorred is the one you actually want (or
> > you can use the tarball).
>
> Either does nothing. Perhaps they don't support rebasing of branches
> which are already merged with trunk.
You could always experiment by checking out an older revision of your
branch.
In any case, there's nothing intrinsically wrong with merging in
branches that themselves have merge history. We do this ourselves quite
frequently; see the recent savedefault merge, for example.
--
Colin Watson [cjwatson@ubuntu.com]
prev parent reply other threads:[~2010-01-19 11:53 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-19 1:57 fb rotation merge directive Michal Suchanek
2010-01-19 11:07 ` Colin Watson
2010-01-19 11:20 ` Colin Watson
2010-01-19 11:44 ` Michal Suchanek
2010-01-19 11:53 ` Colin Watson [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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100119115318.GC5847@riva.ucam.org \
--to=cjwatson@ubuntu.com \
--cc=grub-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.
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.