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

List:       kde-frameworks-devel
Subject:    Re: Cherry picking SMB changes from kde-runtime master to frameworks. Err...
From:       Dawit A <adawit () kde ! org>
Date:       2013-12-01 5:56:59
Message-ID: CALa28R5QTmAig6xQ2WWBAfEjbyLWFiqw1ERkwD=UxyuGCa=vhQ () mail ! gmail ! com
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


On Sat, Nov 30, 2013 at 9:25 PM, Mark Gaiser <markg85@gmail.com> wrote:

> Hi,
>
> I don't even know if cherry picking is the right approach so it might
> be better if i explain what i want to do. You, git gurus, surely can
> share how i need to get there, right? :)
>
> In recent months Dawit (in cc) has added quite some nice optimizations
> to the SMB kioslave. He' done with those changes now so i'd like to
> pull those into the frameworks branch and update my porting patch to
> get that slave working on Qt5/KF5.
>
> The question is: What is the best way to get those changes from master
> to frameworks? You can easily see the changes by checking out the
> master branch (kde-runtime) and typing:
> git log --stat b21dc0a.. kioslave/smb/
>
> @Dawit, are those all the changes you made? Or did you also do
> something related but outside the smb folder?
>

Yes, 6c0de32 being the one about the optimization.

[Attachment #5 (text/html)]

<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Sat, \
Nov 30, 2013 at 9:25 PM, Mark Gaiser <span dir="ltr">&lt;<a \
href="mailto:markg85@gmail.com" target="_blank">markg85@gmail.com</a>&gt;</span> \
wrote:<br>

<blockquote class="gmail_quote" style="margin:0px 0px 0px \
0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">Hi,<br>
 <br>
I don&#39;t even know if cherry picking is the right approach so it might<br>
be better if i explain what i want to do. You, git gurus, surely can<br>
share how i need to get there, right? :)<br>
<br>
In recent months Dawit (in cc) has added quite some nice optimizations<br>
to the SMB kioslave. He&#39; done with those changes now so i&#39;d like to<br>
pull those into the frameworks branch and update my porting patch to<br>
get that slave working on Qt5/KF5.<br>
<br>
The question is: What is the best way to get those changes from master<br>
to frameworks? You can easily see the changes by checking out the<br>
master branch (kde-runtime) and typing:<br>
git log --stat b21dc0a.. kioslave/smb/<br>
<br>
@Dawit, are those all the changes you made? Or did you also do<br>
something related but outside the smb folder?<br></blockquote><div><br></div><div \
style>Yes, 6c0de32 being the one about the optimization.  </div></div></div></div>



_______________________________________________
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel


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