[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PULL 00/11] Ui 20171016 patches
From: |
Daniel P. Berrange |
Subject: |
Re: [Qemu-devel] [PULL 00/11] Ui 20171016 patches |
Date: |
Thu, 19 Oct 2017 10:13:08 +0100 |
User-agent: |
Mutt/1.9.1 (2017-09-22) |
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 :|
- [Qemu-devel] [PULL 04/11] ui: convert common input code to keycodemapdb, (continued)
- [Qemu-devel] [PULL 04/11] ui: convert common input code to keycodemapdb, Gerd Hoffmann, 2017/10/16
- [Qemu-devel] [PULL 07/11] tools: add qemu-keymap, Gerd Hoffmann, 2017/10/16
- [Qemu-devel] [PULL 10/11] ui/gtk: Fix deprecation of vte_terminal_copy_clipboard, Gerd Hoffmann, 2017/10/16
- [Qemu-devel] [PULL 06/11] ui: don't export qemu_input_event_new_key, Gerd Hoffmann, 2017/10/16
- [Qemu-devel] [PULL 02/11] docker: don't rely on submodules existing in the main checkout, Gerd Hoffmann, 2017/10/16
- [Qemu-devel] [PULL 08/11] Add pc-bios/keymaps/Makefile, Gerd Hoffmann, 2017/10/16
- [Qemu-devel] [PULL 09/11] pc-bios/keymaps: keymaps update, Gerd Hoffmann, 2017/10/16
- Re: [Qemu-devel] [PULL 00/11] Ui 20171016 patches, Peter Maydell, 2017/10/17
- Re: [Qemu-devel] [PULL 00/11] Ui 20171016 patches, Thomas Huth, 2017/10/19