Eric Blake wrote:
On 01/12/2015 07:51 AM, John Ferlan wrote:
> On 01/10/2015 12:03 AM, Jim Fehlig wrote:
>
>> This reverts commit 2c78051a14acfb7aba078d569b1632dfe0ca0853.
>>
>> Conflicts:
>> src/Makefile.am
>>
>> Signed-off-by: Jim Fehlig <jfehlig(a)suse.com>
>> ---
>> .gitignore | 1 -
>> cfg.mk | 3 +-
>> configure.ac | 1 -
>> po/POTFILES.in | 1 -
>> src/Makefile.am | 25 +--
>> src/libvirt_xenconfig.syms | 4 -
>> src/xenconfig/xen_common.c | 3 +-
>> src/xenconfig/xen_xl.c | 499 ------------------------------------------
>> src/xenconfig/xen_xl.h | 33 ---
>> src/xenconfig/xen_xl_disk.l | 256 ----------------------
>> src/xenconfig/xen_xl_disk_i.h | 39 ----
>> 11 files changed, 4 insertions(+), 861 deletions(-)
>>
>>
> OK - so reverting is fine; however, xen_xl_disk.{c,h} still exist...
> Simple enough solution, but they will show up in someone's git status
> output since they are also removed from .gitignore.
>
It's a transient issue - someone that only checked out git at v1.2.11
won't see the generated files; the few of us that do incremental work
can modify .git/info/exclude manually to ignore leftover generated
files. But if you also want to explicitly ignore the generated files in
.gitignore, go for it.
ACK 1-9, and I'm liking the initial work of 10-12 other than the
Coverity issues that it introduces.
I've pushed 1-9 and will resend 10-12 after fixing the Coverity issues
and addressing John's comments.
Regards,
Jim