From: "Daniel P. Berrange" <berrange@redhat.com>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: Thomas Huth <thuth@redhat.com>,
qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Subject: Re: [Qemu-devel] [PULL 00/11] Ui 20171016 patches
Date: Thu, 19 Oct 2017 10:13:08 +0100 [thread overview]
Message-ID: <20171019091308.GE8408@redhat.com> (raw)
In-Reply-To: <1508397252.10073.10.camel@redhat.com>
On Thu, Oct 19, 2017 at 09:14:12AM +0200, Gerd Hoffmann wrote:
> Hi,
>
> > I just noticed that I now get the following warning message when I
> > change to an older git branch:
> >
> > warning: unable to rmdir ui/keycodemapdb: Directory not empty
> >
> > ... this is kind of ugly, is there a way to fix this?
>
> Hmm, no good idea, other than just rebasing the branch to latest
> master. It's one of the issues with submodules.
>
> Related issue shows up if you go back to an older branch after a
> firmware update. git shows the firmware submodule as modified then and
> you have to take care that you don't revert the change by accident.
> Which can easily happen with "git commit -a" ...
If you do a 'make' before committing though the configure code will take
care to re-sync submodules, helping to avoid this problem going forward.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
next prev parent reply other threads:[~2017-10-19 9:13 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-16 13:16 [Qemu-devel] [PULL 00/11] Ui 20171016 patches Gerd Hoffmann
2017-10-16 13:16 ` [Qemu-devel] [PULL 01/11] build: automatically handle GIT submodule checkout for dtc Gerd Hoffmann
2017-10-19 14:05 ` Anthony PERARD
2017-10-19 14:15 ` Daniel P. Berrange
2017-10-16 13:16 ` [Qemu-devel] [PULL 02/11] docker: don't rely on submodules existing in the main checkout Gerd Hoffmann
2017-10-16 13:16 ` [Qemu-devel] [PULL 03/11] ui: add keycodemapdb repository as a GIT submodule Gerd Hoffmann
2017-10-16 13:16 ` [Qemu-devel] [PULL 04/11] ui: convert common input code to keycodemapdb Gerd Hoffmann
2017-10-16 13:16 ` [Qemu-devel] [PULL 05/11] ui: convert key events to QKeyCodes immediately Gerd Hoffmann
2017-10-16 13:16 ` [Qemu-devel] [PULL 06/11] ui: don't export qemu_input_event_new_key Gerd Hoffmann
2017-10-16 13:16 ` [Qemu-devel] [PULL 07/11] tools: add qemu-keymap Gerd Hoffmann
2017-10-19 22:09 ` Eric Blake
2017-10-19 22:12 ` Eric Blake
2017-10-20 6:52 ` Thomas Huth
2017-10-20 7:09 ` Fam Zheng
2017-10-16 13:16 ` [Qemu-devel] [PULL 08/11] Add pc-bios/keymaps/Makefile Gerd Hoffmann
2017-10-16 13:16 ` [Qemu-devel] [PULL 09/11] pc-bios/keymaps: keymaps update Gerd Hoffmann
2017-10-16 13:16 ` [Qemu-devel] [PULL 10/11] ui/gtk: Fix deprecation of vte_terminal_copy_clipboard Gerd Hoffmann
2017-10-16 13:16 ` [Qemu-devel] [PULL 11/11] gtk: fix wrong id between texture and framebuffer Gerd Hoffmann
2017-10-17 9:44 ` [Qemu-devel] [PULL 00/11] Ui 20171016 patches Peter Maydell
2017-10-19 6:50 ` Thomas Huth
2017-10-19 7:14 ` Gerd Hoffmann
2017-10-19 9:13 ` Daniel P. Berrange [this message]
2017-10-19 9:11 ` Daniel P. Berrange
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=20171019091308.GE8408@redhat.com \
--to=berrange@redhat.com \
--cc=kraxel@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/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 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 NNTP newsgroup(s).