[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-edu-devel
Subject:    D18230: Added admin mode to question and answer activity
From:       Johnny Jazeix <noreply () phabricator ! kde ! org>
Date:       2019-04-16 6:25:31
Message-ID: 30fd2d7d015470afa787d870da49f164 () localhost ! localdomain
[Download RAW message or body]

[Attachment #2 (text/plain)]

jjazeix added a comment.


  In D18230#450369 <https://phabricator.kde.org/D18230#450369>, @echarruau wrote:
  
  > Hi,
  >  I am working from a fresh version of master and get the same problem when I want \
to apply diff for both D18230 <https://phabricator.kde.org/D18230>.diff  >
  >   and D18600.diff.
  >
  > error: patch failed: src/activities/activities.txt:119
  >  Could you on your side apply your patch to see if it is working?
  > Thanks
  
  
  That's normal. That's 2 separate independant patches doing different things. If \
they collide, there is nothing to do, just apply one or the other. Or update the \
second patch to not update activities.txt file and do the change by hand after \
applying the patch.

REPOSITORY
  R2 GCompris

REVISION DETAIL
  https://phabricator.kde.org/D18230

To: AkshayCHD, #gcompris_activities
Cc: jjazeix, echarruau, kde-edu, #gcompris_activities, sanjayshetty, parimalprasoon, \
harrymecwan, ganeshredcobra, nityanandkumar, andreask, rahulyadav, narvaez, \
scagarwal, apol, timotheegiet, bcoudoin


[Attachment #3 (text/html)]

<table><tr><td style="">jjazeix added a comment.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: \
right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: \
#F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: \
inline-block; border: 1px solid rgba(71,87,120,.2);" \
href="https://phabricator.kde.org/D18230">View Revision</a></tr></table><br \
/><div><div><blockquote style="border-left: 3px solid #8C98B8;  color: #6B748C;
          font-style: italic;
          margin: 4px 0 12px 0;
          padding: 8px 12px;
          background-color: #F8F9FC;">
<div style="font-style: normal;
          padding-bottom: 4px;">In <a \
href="https://phabricator.kde.org/D18230#450369" style="background-color: #e7e7e7;  \
border-color: #e7e7e7;  border-radius: 3px;
          padding: 0 4px;
          font-weight: bold;
          color: black;text-decoration: none;">D18230#450369</a>, <a \
href="https://phabricator.kde.org/p/echarruau/" style="  border-color: #f1f7ff;
              color: #19558d;
              background-color: #f1f7ff;
                border: 1px solid transparent;
                border-radius: 3px;
                font-weight: bold;
                padding: 0 4px;">@echarruau</a> wrote:</div>
<div style="margin: 0;
          padding: 0;
          border: 0;
          color: rgb(107, 116, 140);"><p>Hi,<br />
 I am working from a fresh version of master and get the same problem when I want to \
apply diff for both <a href="https://phabricator.kde.org/D18230" \
style="background-color: #e7e7e7;  border-color: #e7e7e7;
          border-radius: 3px;
          padding: 0 4px;
          font-weight: bold;
          color: black;text-decoration: none;">D18230</a>.diff</p>

<div class="remarkup-code-block" style="margin: 12px 0;" data-code-lang="text" \
data-sigil="remarkup-code-block"><pre class="remarkup-code" style="font: 11px/15px \
&quot;Menlo&quot;, &quot;Consolas&quot;, &quot;Monaco&quot;, monospace; padding: \
12px; margin: 0; background: rgba(71, 87, 120, 0.08);">and D18600.diff.</pre></div>

<p>error: patch failed: src/activities/activities.txt:119<br />
 Could you on your side apply your patch to see if it is working?<br />
Thanks</p></div>
</blockquote>

<p>That&#039;s normal. That&#039;s 2 separate independant patches doing different \
things. If they collide, there is nothing to do, just apply one or the other. Or \
update the second patch to not update activities.txt file and do the change by hand \
after applying the patch.</p></div></div><br \
/><div><strong>REPOSITORY</strong><div><div>R2 GCompris</div></div></div><br \
/><div><strong>REVISION DETAIL</strong><div><a \
href="https://phabricator.kde.org/D18230">https://phabricator.kde.org/D18230</a></div></div><br \
/><div><strong>To: </strong>AkshayCHD, GCompris: Activities<br /><strong>Cc: \
</strong>jjazeix, echarruau, kde-edu, GCompris: Activities, sanjayshetty, \
parimalprasoon, harrymecwan, ganeshredcobra, nityanandkumar, andreask, rahulyadav, \
narvaez, scagarwal, apol, timotheegiet, bcoudoin<br /></div>



[prev in list] [next in list] [prev in thread] [next in thread]