On Tue, Jan 3, 2017 at 7:22 PM, Ulrich Pegelow <ulrich.pege...@tongareva.de> wrote: > Am 02.01.2017 um 22:27 schrieb Roman Lebedev: >> >> Hi everyone. >> >> Starting with today, darktable git master tracks rawspeed >> library as a submodule. >> >> Which means, after updating darktable repo (git pull/git fetch), >> and before building, you now need to make sure that the >> submodule is updated to. >> > > Hmm... > > $ git pull > $ git submodule init > $ git submodule update > $ ./build ... etc -> all OK > $ git checkout darktable-2.2.x > error: The following untracked working tree files would be overwritten by > checkout: > src/external/rawspeed/.gitattributes > src/external/rawspeed/.gitignore > src/external/rawspeed/CMakeLists.txt > src/external/rawspeed/LICENSE > src/external/rawspeed/README.md > [ ... many more ... ] > src/external/rawspeed/RawSpeed/MosDecoder.h > src/external/rawspeed/RawSpeed/MrwDecoder.cpp > src/external/rawspeed/RawSpeed/MrwDeco > Aborting > $ > > What now? $ git checkout -f darktable-2.2.x
> Ulrich Roman. >> >> And day-to-day, after git pull for darktable >> (i'm not 100% sure about the exact command, >> someone with more knowledge please do chime in) >> $ cd src/external/rawspeed && git pull && \ >> git checkout -f && git submodule update -f >> >> Roman. >> >> ___________________________________________________________________________ >> 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
