Am Mittwoch, 4. Januar 2017, 19:33:27 CET schrieb Ulrich Pegelow:
> Well, that's an option. But I almost already hear the screams when
> people screw things up by using force at the wrong place.
I don't like it either. One reason more to not use branches.
> Ulrich
Tobias
> Am 04.01.2017 um
Hi Ulrich,
> Well, that's an option. But I almost already hear the screams when
> people screw things up by using force at the wrong place.
I understand your concern but submodules are a really powerful Git
feature, when mastered it is really helpful for tracking external
repos.
--
Pascal
Well, that's an option. But I almost already hear the screams when
people screw things up by using force at the wrong place.
Ulrich
Am 04.01.2017 um 19:15 schrieb Roman Lebedev:
So:
~/darktable$ git describe
release-2.3.0-150-gec88795ce
$ git submodule status
So:
~/darktable$ git describe
release-2.3.0-150-gec88795ce
$ git submodule status
8c0a57825a6e209b109ac18f8ba6966b36c596eb src/external/rawspeed (heads/develop)
~/darktable$ ls -lah src/external/rawspeed/CMakeLists.txt
-rw-r--r-- 1 lebedevri lebedevri 1.9K Jan 4 20:57
Hi,
that recent move has now screwed everything here :(
If I want to build:
CMake Error at src/external/CMakeLists.txt:4 (add_subdirectory):
The source directory
/home/pegelow/darktable/src/external/rawspeed
does not contain a CMakeLists.txt file.
and ./build.sh aborts (and I did
> On 4 Jan 2017, at 18:21, Roman Lebedev wrote:
>
>> On Wed, Jan 4, 2017 at 10:20 AM, wrote:
>> Changes to cmake files is probably the culprit - rawspeed now doesn't
>> inherit CFLAGS from darktable and so is missing include path for libjpeg.
>
> But
On Wed, Jan 4, 2017 at 10:20 AM, wrote:
> Changes to cmake files is probably the culprit - rawspeed now doesn't inherit
> CFLAGS from darktable and so is missing include path for libjpeg.
But from where did darktable get that jpeg include path? From user?
rawspeed does look
Changes to cmake files is probably the culprit - rawspeed now doesn't inherit
CFLAGS from darktable and so is missing include path for libjpeg.
P.S.
About switching from stable to master branch and back - there're also issues
with cherry-picking commits for some reason. We need to come up with
Roman Lebedev wrote:
> On Tue, Jan 3, 2017 at 1:46 AM, Wolfgang Goetz
> wrote:
> > MacOS/brew broken:
> > ...
> > [ 2%] Building CXX object
> > src/external/rawspeed/RawSpeed/CMakeFiles/rawspeed.dir/ArwDecoder.cpp.o
> > In file included
> > from
> >
On Tue, Jan 3, 2017 at 10:11 PM, johannes hanika 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
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?
-jo
On Wed, Jan 4, 2017 at 7:57 AM, Ulrich Pegelow
wrote:
> Am 03.01.2017 um 17:29 schrieb Roman Lebedev:
>>
>> On Tue, Jan 3, 2017 at
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
On Tue, Jan 3, 2017 at 7:22 PM, Ulrich Pegelow
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
On Tue, 03 Jan 2017 19:23:43 +1100, Roman Lebedev
wrote:
On Tue, Jan 3, 2017 at 2:07 AM, Terry Duell wrote:
On Tue, 03 Jan 2017 09:46:23 +1100, Wolfgang Goetz
wrote:
Terry Duell wrote:
[snip]
That does the
On Tue, Jan 3, 2017 at 1:46 AM, Wolfgang Goetz wrote:
> MacOS/brew broken:
> ...
> [ 2%] Building CXX object
> src/external/rawspeed/RawSpeed/CMakeFiles/rawspeed.dir/ArwDecoder.cpp.o
> In file included
> from
>
On Tue, Jan 3, 2017 at 2:07 AM, Terry Duell wrote:
> On Tue, 03 Jan 2017 09:46:23 +1100, Wolfgang Goetz
> wrote:
>
>> Terry Duell wrote:
>
>
> [snip]
>
>>> Well that seems to have buggered things up :-)
>>> I suspect that the above commands might not
On Tue, 03 Jan 2017 09:46:23 +1100, Wolfgang Goetz
wrote:
Terry Duell wrote:
[snip]
Well that seems to have buggered things up :-)
I suspect that the above commands might not be right...attempting to
build results in a message that src/external/rawspeed has no
Terry Duell wrote:
> On Tue, 03 Jan 2017 08:27:00 +1100, Roman Lebedev
> wrote:
>
> > 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
On Tue, 03 Jan 2017 08:27:00 +1100, Roman Lebedev
wrote:
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
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.
After fresh clone, you need to run this once:
$ git
20 matches
Mail list logo