On Thu, Oct 19, 2017 at 08:50:02AM +0200, Thomas Huth wrote: > On 16.10.2017 15:16, Gerd Hoffmann wrote: > > The following changes since commit f90ea7ba7c5ae7010ee0ce062207ae42530f57d6: > > > > Merge remote-tracking branch > > 'remotes/pmaydell/tags/pull-target-arm-20171012' into staging (2017-10-12 > > 17:06:50 +0100) > > > > are available in the git repository at: > > > > git://git.kraxel.org/qemu tags/ui-20171016-pull-request > > > > for you to fetch changes up to 2ff408de9c080f2fb5a94ebf6a209c6180c64933: > > > > gtk: fix wrong id between texture and framebuffer (2017-10-16 14:50:54 > > +0200) > > > > ---------------------------------------------------------------- > > ui: use keycodemapdb for key code mappings, part one (v2) > > ui: add qemu-keymap, update reverse keymaps (for qemu -k $map) > > ui: fix for vte 0.50 > > ui: gtk texture fix > > 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?
There's no way to automatically clean that up when switching to older branches. You can do 'git submodule deinit -f ui/keycodemapdb' *before* switching to the old branch, or just 'git submodule deinit -f --all'. Having this stable submodule should be completely harmless though as nothing in the older branch will be using it. So IMHO just ignore the warning message - its only ever going to be a very short term problem for people until they rebase their branches to git master (aside from those few people working on stable maint branches) 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 :|
