Okay great. thanks for the walk through! I did it all wrong and that explains a lot. Now it builds okay with internationalization and all. I can see changes in the translation again.
Problem solved On Tue, Oct 25, 2016 at 7:15 PM, Roman Lebedev <lebedev...@gmail.com> wrote: > On Tue, Oct 25, 2016 at 7:06 PM, Tobias Ellinghaus <m...@houz.org> wrote: > > Am Dienstag, 25. Oktober 2016, 18:32:18 CEST schrieb shlomi braitbart: > >> shlomi@avia:~/darktable2/darktable$ cat > >> /home/shlomi/darktable2/darktable/.git/config > >> [core] > >> repositoryformatversion = 0 > >> filemode = true > >> bare = false > >> logallrefupdates = true > >> [remote "origin"] > >> url = https://github.com/sbraitbart/darktable.git > >> fetch = +refs/heads/*:refs/remotes/origin/* > >> [branch "master"] > >> remote = origin > >> merge = refs/heads/master > >> [remote "upstream"] > >> url = https://github.com/darktable-org/darktable.git > >> fetch = +refs/heads/*:refs/remotes/upstream/* > > > > So you are not on OUR master but you own fork. That explains why you > don't get > > our fixes. Roman might know how to update that. > That is actually the normal way of doing github. > > Then the workflow is: > $ git fetch --all -p # get all the stuff from us > $ git rebase upstream/master master # updates your master branch > $ git push origin # updates master branch in your github clone > > And when you want make changes, > $ git checkout upstream/master > $ git checkout -b newbranch > do some commits > $ git push origin > <update agains new master> > $ git rebase upstream/master newbranch > > And so on. > That is of course just the surface. > > >> On Tue, Oct 25, 2016 at 6:25 PM, Tobias Ellinghaus <m...@houz.org> wrote: > >> > Please show > >> > /home/shlomi/darktable2/darktable/.git/config > >> > > >> > Am Dienstag, 25. Oktober 2016, 18:13:38 CEST schrieb shlomi braitbart: > >> > > So if I understood correctly: > >> > > shlomi@avia:~/darktable2/darktable$ git fetch --tags > >> > > shlomi@avia:~/darktable2/darktable$ git fetch --tags upstream > >> > > shlomi@avia:~/darktable2/darktable$ git fetch upstream > >> > > shlomi@avia:~/darktable2/darktable$ ./build.sh > > ../cmake_output30.txt > >> > > -- multiarch triplet detected: x86_64-linux-gnu > >> > > -- Checking for -march=native support > >> > > Missing fop > >> > > Can NOT build Lua API documentation > >> > > /home/shlomi/darktable2/darktable/src/external/ > rawspeed/data/cameras.xml > >> > > validates > >> > > Validation of files failed > >> > > make[2]: *** [data/darktable.appdata.xml] Error 1 > >> > > make[1]: *** [data/CMakeFiles/darktable.appdata_file.dir/all] > Error 2 > >> > > make[1]: *** Waiting for unfinished jobs.... > >> > > make: *** [all] Error 2 > >> > > > >> > > attached is the cmake output > >> > > > >> > > On Tue, Oct 25, 2016 at 5:49 PM, Roman Lebedev < > lebedev...@gmail.com> > >> > > >> > wrote: > >> > > > On Tue, Oct 25, 2016 at 5:28 PM, shlomi braitbart < > >> > > >> > sbraitb...@gmail.com> > >> > > >> > > > wrote: > >> > > > > Okay here is what I got: > >> > > > > > >> > > > > shlomi@avia:~/darktable2/darktable$ git pull --tags > >> > > > > Already up-to-date. > >> > > > > shlomi@avia:~/darktable2/darktable$ git pull --tags upstream > >> > > > > remote: Counting objects: 50, done. > >> > > > > remote: Compressing objects: 100% (50/50), done. > >> > > > > remote: Total 50 (delta 17), reused 0 (delta 0), pack-reused 0 > >> > > > > Unpacking objects: 100% (50/50), done. > >> > > > > From https://github.com/darktable-org/darktable > >> > > > > > >> > > > > 961f311..6d3a382 master -> upstream/master > >> > > > > > >> > > > > It doesn't make sense to pull all tags; you probably meant: > >> > > > > git fetch --tags > >> > > > > >> > > > Err, i indeed meant $ git fetch --tags > >> > > > > >> > > > :) > >> > > > : > >> > > > > shlomi@avia:~/darktable2/darktable$ git fetch upstream > >> > > > > shlomi@avia:~/darktable2/darktable$ ./build.sh > > >> > > >> > ../cmake_output29.txt > >> > > >> > > > > -- multiarch triplet detected: x86_64-linux-gnu > >> > > > > -- Checking for -march=native support > >> > > > > Missing fop > >> > > > > Can NOT build Lua API documentation > >> > > > > /home/shlomi/darktable2/darktable/src/external/ > >> > > >> > rawspeed/data/cameras.xml > >> > > >> > > > > validates > >> > > > > Validation of files failed > >> > > > > make[2]: *** [data/darktable.appdata.xml] Error 1 > >> > > > > make[1]: *** [data/CMakeFiles/darktable.appdata_file.dir/all] > Error > >> > > >> > 2 > >> > > >> > > > > make[1]: *** Waiting for unfinished jobs.... > >> > > > > make: *** [all] Error 2 > >> > > > > > >> > > > > the cmake output is attached. > >> > > > > Seems the same to me. > >> > > > > > >> > > > > > >> > > > > On Tue, Oct 25, 2016 at 5:19 PM, Roman Lebedev < > lebedev...@gmail.com > >> > > > > >> > > > wrote: > >> > > > >> try > >> > > > >> > >> > > > >> git pull --tags > >> > > > >> git pull --tags upstream > >> > > > >> git fetch upstream > >> > > > >> > >> > > > >> On Tue, Oct 25, 2016 at 5:11 PM, shlomi braitbart < > >> > > >> > sbraitb...@gmail.com > >> > > >> > > > >> wrote: > >> > > > >> > Still getting the > >> > > > >> > Already up-to-date > >> > > > >> > message with no change of number: > >> > > > >> > > >> > > > >> > git describe > >> > > > >> > release-0.9.3-13734-ge493501 > >> > > > >> > git status > >> > > > >> > On branch master > >> > > > >> > Your branch is ahead of 'origin/master' by 3 commits. > >> > > > >> > > >> > > > >> > (use "git push" to publish your local commits) > >> > > > >> > > >> > > > >> > Untracked files: > >> > > > >> > (use "git add <file>..." to include in what will be > committed) > >> > > > >> > > >> > > > >> > po/he.mo > >> > > > >> > > >> > > > >> > nothing added to commit but untracked files present (use "git > >> > > >> > add" to > >> > > >> > > > >> > track) > >> > > > >> > > >> > > > >> > > >> > > > >> > > >> > > > >> > On Tue, Oct 25, 2016 at 12:33 PM, Tobias Ellinghaus < > m...@houz.org> > >> > > > > >> > > > wrote: > >> > > > >> >> Am Montag, 24. Oktober 2016, 20:06:23 CEST schrieb shlomi > >> > > >> > braitbart: > >> > > > >> >> > git describe > >> > > > >> >> > release-0.9.3-13734-ge493501 > >> > > > >> >> > >> > > > >> >> That looks good. Does a "git pull" bring you any updates > now? > >> > > > >> >> And > >> > > > >> >> change > >> > > > >> >> the > >> > > > >> >> 13734 to 13738 or something like that? > >> > > > >> >> > >> > > > >> >> > git status > >> > > > >> >> > On branch master > >> > > > >> >> > Your branch is ahead of 'origin/master' by 3 commits. > >> > > > >> >> > > >> > > > >> >> > (use "git push" to publish your local commits) > >> > > > >> >> > > >> > > > >> >> > Untracked files: > >> > > > >> >> > (use "git add <file>..." to include in what will be > >> > > >> > committed) > >> > > >> > > > >> >> > po/he.mo > >> > > > >> >> > > >> > > > >> >> > nothing added to commit but untracked files present (use > "git > >> > > >> > add" > >> > > >> > > > to > >> > > > > >> > > > >> >> > track) > >> > > > >> >> > > >> > > > >> >> > Shlomi > >> > > > >> >> > > >> > > > >> >> > On Mon, Oct 24, 2016 at 7:27 PM, Tobias Ellinghaus < > >> > > >> > m...@houz.org> > >> > > >> > > > >> >> > wrote: > >> > > > >> >> > > Am Montag, 24. Oktober 2016, 15:58:32 CEST schrieb > shlomi > >> > > > >> >> > > > >> > > > >> >> > > braitbart: > >> > > > >> >> > > > When I do > >> > > > >> >> > > > $ git pull > >> > > > >> >> > > > I am getting: > >> > > > >> >> > > > $ Already up-to-date. > >> > > > >> >> > > > >> > > > >> >> > > That sounds odd as I pushed changes before I wrote my > last > >> > > >> > mail. > >> > > >> > > > >> >> > > What is the output of > >> > > > >> >> > > > >> > > > >> >> > > cd /home/shlomi/darktable2/darktable/ > >> > > > >> >> > > git describe > >> > > > >> >> > > git status > >> > > > >> >> > > > >> > > > >> >> > > > (I am on the master branch) > >> > > > >> >> > > > Trying to build result in an error same as before > >> > > > >> >> > > > (attached > >> > > > > >> > > > file) > >> > > > > >> > > > >> >> > > > I also attache CMakeCache.txt > >> > > > >> >> > > > >> > > > >> >> > > Tobias > >> > > > >> >> > > > >> > > > >> >> > > [...] > >> > > > >> >> > > >> > > > >> >> > ______________________________ > ______________________________ > >> > > > > >> > > > _______________ > >> > > > > >> > > > >> >> > 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+unsubscribe@ > >> > > >> > lists.darktable.org > >> > >> ____________________________________________________________ > _______________ > >> darktable developer mailing list > >> to unsubscribe send a mail to darktable-dev+unsubscribe@ > lists.darktable.org > > > ____________________________________________________________ > _______________ > darktable developer mailing list > to unsubscribe send a mail to darktable-dev+unsubscribe@ > lists.darktable.org > > ___________________________________________________________________________ darktable developer mailing list to unsubscribe send a mail to darktable-dev+unsubscr...@lists.darktable.org
