From kde-frameworks-devel  Sun Dec 01 05:56:59 2013
From: Dawit A <adawit () kde ! org>
Date: Sun, 01 Dec 2013 05:56:59 +0000
To: kde-frameworks-devel
Subject: Re: Cherry picking SMB changes from kde-runtime master to frameworks. Err...
Message-Id: <CALa28R5QTmAig6xQ2WWBAfEjbyLWFiqw1ERkwD=UxyuGCa=vhQ () mail ! gmail ! com>
X-MARC-Message: https://marc.info/?l=kde-frameworks-devel&m=138588650006494
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--===============4784403523879150316=="

--===============4784403523879150316==
Content-Type: multipart/alternative; boundary=089e0115eef8b619bd04ec72bd92

--089e0115eef8b619bd04ec72bd92
Content-Type: text/plain; charset=UTF-8

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.

--089e0115eef8b619bd04ec72bd92
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

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

<blockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-=
left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;p=
adding-left:1ex">Hi,<br>
<br>
I don&#39;t even know if cherry picking is the right approach so it might<b=
r>
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></di=
v><div style>Yes, 6c0de32 being the one about the optimization.=C2=A0</div>=
</div></div></div>

--089e0115eef8b619bd04ec72bd92--

--===============4784403523879150316==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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

--===============4784403523879150316==--