GNOME Bugzilla – Bug 569015
Generated win32 config.h file in git
Last modified: 2013-09-18 16:47:05 UTC
Please describe the problem: Some files are generated, yet in git. It's a pain in the arse, as they needlessly either conflict, need a dummy commit to move them out of the way, or prevent a clean pull. Steps to reproduce: 1. clone (eg) gst-plugins-base 2. ./configure && make 3. git pull Actual results: error: Entry 'win32/common/config.h' not uptodate. Cannot merge. The merge then fails. Expected results: the merge should succeed (bar any changes made to the tree leading to conflicts) Does this happen every time? Maybe, maybe not. Other information: .po files are also in git, and are also modified in the build process. This means you end up with an unclean tree. Please do not place generated files in the repository, it's always more pain that it alleviates.
I've not had that happen in a while. Since the file I mentioned was in a submodule, I can guess that I probably did not update that submodule properly, though I don't see why configure/make would have changed it to cause a future merge fail. In any case, it seems fine now, so I'll call it a PEBKAC :)
This is still the case in ugly and bad and would be good to fix.
I think this is fixed now everywhere, right?
nope - bad still has it.
*** Bug 704055 has been marked as a duplicate of this bug. ***
(In reply to comment #3) > I think this is fixed now everywhere, right? Can you provide patch reference ?
<slomo> __tim: https://bugzilla.gnome.org/show_bug.cgi?id=569015 didn't you fix that recently? <__tim> don't think it's fixed for -bad <__tim> let me check <slomo> how was it fixed elsewhere? <__tim> basically, look at the end of e.g. configure.ac in -good <slomo> __tim: manually creating that file and putting it as config.h-new, and only moving back in make dist? <__tim> something like that <__tim> there's a win32-update target iirc
commit 994739332d229a96fdc6bee9932d72349c29c614 Author: Tim-Philipp Müller <tim@centricular.net> Date: Mon Sep 2 13:40:37 2013 +0100 Change how win32/common/config.h is updated Generate win32/common/config.h-new directly from config.h.in, using shell variables in configure and some hard-coded information. Change top-level makefile so that 'make win32-update' copies the generated file to win32/common/config.h, which we keep in source control. It's kept in source control so that the git tree is buildable from VS. This change is similar to the one recently applied to GStreamer and gst-plugins-good. The previous config.h file in -bad was in pretty bad shape, so unlike core and base, I didn't attempt to leave it strictly the same, but fixed it as necessary. Needs testing I cannot do myself. https://bugzilla.gnome.org/show_bug.cgi?id=569015