On Tue, Jan 3, 2017 at 10:11 PM, johannes hanika <hana...@gmail.com> wrote: > yeah that is annoying. is it a good idea to add that file to > .gitignore? or is this indeed the mechanism to update the submodule? Looking at https://github.com/darktable-org/darktable/commit/3b4c49d16b859758ddeccdf8a261719ac3f0c5f9.patch i'm not seeing any other changes that would contain the rawspeed repo commit, so that is indeed the the mechanism to update the submodule.
As for rawspeed being separate library, it will add one more cmake&&make&&make install chain, which is also not cool. > -jo Roman. > On Wed, Jan 4, 2017 at 7:57 AM, Ulrich Pegelow > <ulrich.pege...@tongareva.de> wrote: >> Am 03.01.2017 um 17:29 schrieb Roman Lebedev: >>> >>> On Tue, Jan 3, 2017 at 7:22 PM, Ulrich Pegelow >>>> >>>> What now? >>> >>> $ git checkout -f darktable-2.2.x >>> >> >> Yep, works. But then: >> >> $ git checkout master >> M src/external/rawspeed >> Switched to branch 'master' >> >> Which means we generate a pseudo modification in src/external/rawspeed: >> >> diff --git a/src/external/rawspeed b/src/external/rawspeed >> --- a/src/external/rawspeed >> +++ b/src/external/rawspeed >> @@ -1 +1 @@ >> -Subproject commit 2452e1afd18e06710decce6961a122f43120bfb6 >> +Subproject commit 2452e1afd18e06710decce6961a122f43120bfb6-dirty >> >> >> If we always need to force a checkout there is quite some risk of >> accidentally loosing changes. Forcing a checkout will just delete any >> uncommited modification. >> >> Ulrich >> >> >> >> ___________________________________________________________________________ >> darktable developer mailing list >> to unsubscribe send a mail to darktable-dev+unsubscr...@lists.darktable.org >> > ___________________________________________________________________________ > darktable developer mailing list > to unsubscribe send a mail to darktable-dev+unsubscr...@lists.darktable.org > ___________________________________________________________________________ darktable developer mailing list to unsubscribe send a mail to darktable-dev+unsubscr...@lists.darktable.org
