<html><head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
</head><body bgcolor="#FFFFFF" text="#000000">Sorry I'm a bit late, I'm in the pacific time zone. Please branch on all major additions. Tiny things like typos are OK to fix and push. Please pull right before you push so we can avoid silly merge commits where ever possible.<br>
<br>
Please push to dev before pushing to master. Dev deploys to <a href="http://staging.digikam.org">staging.digikam.org</a>.<br>
<br>
Best,<br>
Mica<br><br><div class="gmail_quote">On March 30, 2017 6:58:28 AM PDT, Simon Frei <freisim93@gmail.com> wrote:<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
Hi Pat,<br />
<br />
For the short run: What is the general idea with the existing
branches? E.g. adding bigger things to a new feature branch and
small fixes (like typos, link corrections and the like) directly to
dev or master?<br />
<br />
Cheers,<br />
Simon<br />
<br />
<div class="moz-cite-prefix">On 30/03/17 15:51, Pat David wrote:<br />
</div>
<blockquote cite="mid:CAPC+-kmcwqUPPn44b5bgs95EN1ZM871uJnDcqKdaPa1dLVYzzw@mail.gmail.com" type="cite">
<div dir="ltr">
<div dir="ltr" class="gmail_msg">Dmitri,
<div class="gmail_msg"><br class="gmail_msg" />
</div>
<div class="gmail_msg">Did you already create an ssh key, and
add it to your account? You can check on your identityf
page:</div>
<div class="gmail_msg"><br />
</div>
<div class="gmail_msg"><a moz-do-not-send="true" href="http://imgur.com/a/igSq7">http://imgur.com/a/igSq7</a><br />
</div>
<div class="gmail_msg"><br />
</div>
<div class="gmail_msg">Log in, click on "MANAGE SSH KEYS".</div>
<div class="gmail_msg"><br />
</div>
<div class="gmail_msg">There will need to be a key associated
with your account.</div>
<div class="gmail_msg"><br />
</div>
<div class="gmail_msg">I'm happy to write detailed
instructions if you don't have one associated yet (or have
your git setup to use it).</div>
<div class="gmail_msg"><br />
</div>
<div class="gmail_msg">---</div>
<div class="gmail_msg">On a related note, so everyone knows.
I plan on writing detailed documentation on how to
contribute, maintain, and modify the site (with the goal
being that it's documented well enough for anyone else to
pick it up in the future).</div>
<div class="gmail_msg"><br />
</div>
<div class="gmail_msg">I'll start drafting something soon!</div>
<div class="gmail_msg"><br />
</div>
<div class="gmail_msg">pat</div>
<div class="gmail_msg"><br class="gmail_msg" />
</div>
</div>
<br class="gmail_msg" />
<div class="gmail_quote gmail_msg">
<div dir="ltr" class="gmail_msg">On Thu, Mar 30, 2017 at 8:34
AM Dmitri Popov <<a moz-do-not-send="true" href="mailto:lazylegs@gmail.com" class="gmail_msg" target="_blank">lazylegs@gmail.com</a>> wrote:<br class="gmail_msg" />
</div>
<blockquote class="gmail_quote gmail_msg" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Will do.
Thanks, Gilles!<br class="gmail_msg" />
<br class="gmail_msg" />
On Thu, Mar 30, 2017 at 3:25 PM, Gilles Caulier<br class="gmail_msg" />
<<a moz-do-not-send="true" href="mailto:caulier.gilles@gmail.com" class="gmail_msg" target="_blank">caulier.gilles@gmail.com</a>> wrote:<br class="gmail_msg" />
> yes, this is fine.<br class="gmail_msg" />
><br class="gmail_msg" />
> Ask to Ben Cooksley <<a moz-do-not-send="true" href="mailto:bcooksley@kde.org" class="gmail_msg" target="_blank">bcooksley@kde.org</a>> by mail. Perhaps
something is<br class="gmail_msg" />
> wrong...<br class="gmail_msg" />
><br class="gmail_msg" />
> Gilles Caulier<br class="gmail_msg" />
><br class="gmail_msg" />
> 2017-03-30 14:58 GMT+02:00 Dmitri Popov <<a moz-do-not-send="true" href="mailto:lazylegs@gmail.com" class="gmail_msg" target="_blank">lazylegs@gmail.com</a>>:<br class="gmail_msg" />
>><br class="gmail_msg" />
>> Opps, sorry wrong directory! The command returns
this:<br class="gmail_msg" />
>><br class="gmail_msg" />
>> git://<a moz-do-not-send="true" href="http://git.kde.org/websites/digikam-org" rel="noreferrer" class="gmail_msg" target="_blank">git.kde.org/websites/digikam-org</a><br class="gmail_msg" />
>><br class="gmail_msg" />
>> Best,<br class="gmail_msg" />
>> Dmitri<br class="gmail_msg" />
>><br class="gmail_msg" />
>> On Thu, Mar 30, 2017 at 2:26 PM, Gilles Caulier<br class="gmail_msg" />
>> <<a moz-do-not-send="true" href="mailto:caulier.gilles@gmail.com" class="gmail_msg" target="_blank">caulier.gilles@gmail.com</a>> wrote:<br class="gmail_msg" />
>> > DMitry,<br class="gmail_msg" />
>> ><br class="gmail_msg" />
>> > Typically, Ben Coockley add you in account who
are granted to commit.<br class="gmail_msg" />
>> ><br class="gmail_msg" />
>> > What's this comand give for you ?<br class="gmail_msg" />
>> ><br class="gmail_msg" />
>> > git config --get remote.origin.url<br class="gmail_msg" />
>> ><br class="gmail_msg" />
>> > Gilles Caulier<br class="gmail_msg" />
>> ><br class="gmail_msg" />
>> > 2017-03-30 14:07 GMT+02:00 Simon Frei <<a moz-do-not-send="true" href="mailto:freisim93@gmail.com" class="gmail_msg" target="_blank">freisim93@gmail.com</a>>:<br class="gmail_msg" />
>> >><br class="gmail_msg" />
>> >> No, I am wrong. I just tried to confirm my
theory and pushed some minor<br class="gmail_msg" />
>> >> changes (added favicons) to master and it
allowed me to do that. I hope<br class="gmail_msg" />
>> >> I didn't screw up anything...<br class="gmail_msg" />
>> >><br class="gmail_msg" />
>> >> On 30/03/17 14:02, Simon Frei wrote:<br class="gmail_msg" />
>> >> > I don't know what exactly your issue
is, but I noticed that in<br class="gmail_msg" />
>> >> > contrast<br class="gmail_msg" />
>> >> > to the core repo there is the
"typical brach structure" in place.<br class="gmail_msg" />
>> >> > This<br class="gmail_msg" />
>> >> > is probably because master will be
directly pushed into production<br class="gmail_msg" />
>> >> > (?).<br class="gmail_msg" />
>> >> > Mica pushed his recent theme hacking
to a feature branch. So I<br class="gmail_msg" />
>> >> > believe<br class="gmail_msg" />
>> >> > access to the master branch is
restricted (which is a good thing if<br class="gmail_msg" />
>> >> > my<br class="gmail_msg" />
>> >> > assumption about production is true).<br class="gmail_msg" />
>> >> > Can you push your changes to a new
branch?<br class="gmail_msg" />
>> >> ><br class="gmail_msg" />
>> >> > On 30/03/17 13:31, Dmitri Popov
wrote:<br class="gmail_msg" />
>> >> >> So I cloned the repo with
digiKam's new website using the following<br class="gmail_msg" />
>> >> >> command:<br class="gmail_msg" />
>> >> >><br class="gmail_msg" />
>> >> >> git clone git://<a moz-do-not-send="true" href="http://git.kde.org/websites/digikam-org" rel="noreferrer" class="gmail_msg" target="_blank">git.kde.org/websites/digikam-org</a><br class="gmail_msg" />
>> >> >><br class="gmail_msg" />
>> >> >> I made some modifications and
committed them. But when I try to do<br class="gmail_msg" />
>> >> >> git<br class="gmail_msg" />
>> >> >> push, I get the following error:<br class="gmail_msg" />
>> >> >><br class="gmail_msg" />
>> >> >> fatal: remote error: access
denied or repository not exported:<br class="gmail_msg" />
>> >> >> /websites/digikam-org<br class="gmail_msg" />
>> >> >><br class="gmail_msg" />
>> >> >> I have a KDE developer account,
so I assume that I have write<br class="gmail_msg" />
>> >> >> access.<br class="gmail_msg" />
>> >> >> Any idea what I'm doing wrong?<br class="gmail_msg" />
>> >> >><br class="gmail_msg" />
>> >> >> Thanks,<br class="gmail_msg" />
>> >> >> Dmitri<br class="gmail_msg" />
>> >><br class="gmail_msg" />
>> ><br class="gmail_msg" />
><br class="gmail_msg" />
><br class="gmail_msg" />
</blockquote>
</div>
<div dir="ltr" class="gmail_msg">-- <br class="gmail_msg" />
</div>
<div data-smartmail="gmail_signature" class="gmail_msg">
<div dir="ltr" class="gmail_msg"><a moz-do-not-send="true" href="https://patdavid.net" class="gmail_msg" target="_blank">https://patdavid.net</a><br class="gmail_msg" />
GPG: 66D1 7CA6 8088 4874 946D 18BD 67C7 6219 89E9 57AC</div>
</div>
</div>
</blockquote>
<br />
</blockquote></div></body></html>