You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@manifoldcf.apache.org by Karl Wright <da...@gmail.com> on 2015/11/21 21:25:05 UTC
Adding an extensive git pull request into ManifoldCF
Hi all,
We have a contribution that's structured as a github pull request (see
CONNECTORS-1256). It's based off of a fork of the read-only manifoldcf
github image on github. The problem is, I have no idea how to go about
integrating this patch (4 github commits) into a local svn workarea.
Documentation for doing this seems inadequate, that which I could find.
I've tried using git svn, for instance, to set up a local workarea that the
git changes might be applied to; it chugged for 45 minutes trying to do git
svn clone without finishing; had to interrupt it.
If somebody knows some tried-and-true small series of steps for doing this,
please let me know. Barring that, I'd be happy with a way of generating
the diffs for each of the patch commits, and applying them one at a time.
Thanks,
Karl
Re: Adding an extensive git pull request into ManifoldCF
Posted by Rafa Haro <rh...@gmail.com>.
So, that was easy at the end Karl :-)
On Sat, Nov 21, 2015 at 9:35 PM, Karl Wright <da...@gmail.com> wrote:
> Ah, stackoverflow knows how to get a diff or patch:
> http://stackoverflow.com/questions/6188591/download-github-pull-request-as-unified-diff
> Karl
> On Sat, Nov 21, 2015 at 3:25 PM, Karl Wright <da...@gmail.com> wrote:
>> Hi all,
>>
>> We have a contribution that's structured as a github pull request (see
>> CONNECTORS-1256). It's based off of a fork of the read-only manifoldcf
>> github image on github. The problem is, I have no idea how to go about
>> integrating this patch (4 github commits) into a local svn workarea.
>> Documentation for doing this seems inadequate, that which I could find.
>> I've tried using git svn, for instance, to set up a local workarea that the
>> git changes might be applied to; it chugged for 45 minutes trying to do git
>> svn clone without finishing; had to interrupt it.
>>
>> If somebody knows some tried-and-true small series of steps for doing
>> this, please let me know. Barring that, I'd be happy with a way of
>> generating the diffs for each of the patch commits, and applying them one
>> at a time.
>>
>> Thanks,
>> Karl
>>
>>
Re: Adding an extensive git pull request into ManifoldCF
Posted by Karl Wright <da...@gmail.com>.
Ah, stackoverflow knows how to get a diff or patch:
http://stackoverflow.com/questions/6188591/download-github-pull-request-as-unified-diff
Karl
On Sat, Nov 21, 2015 at 3:25 PM, Karl Wright <da...@gmail.com> wrote:
> Hi all,
>
> We have a contribution that's structured as a github pull request (see
> CONNECTORS-1256). It's based off of a fork of the read-only manifoldcf
> github image on github. The problem is, I have no idea how to go about
> integrating this patch (4 github commits) into a local svn workarea.
> Documentation for doing this seems inadequate, that which I could find.
> I've tried using git svn, for instance, to set up a local workarea that the
> git changes might be applied to; it chugged for 45 minutes trying to do git
> svn clone without finishing; had to interrupt it.
>
> If somebody knows some tried-and-true small series of steps for doing
> this, please let me know. Barring that, I'd be happy with a way of
> generating the diffs for each of the patch commits, and applying them one
> at a time.
>
> Thanks,
> Karl
>
>
Re: Adding an extensive git pull request into ManifoldCF
Posted by Karl Wright <da...@gmail.com>.
I honestly have no idea whether it would apply or not. But thanks for the
reference.
Karl
On Sat, Nov 21, 2015 at 7:20 PM, Ahmet Arslan <io...@yahoo.com> wrote:
> Hi Karl,
>
> Does the bot thing described in [1] apply to manifoldcf ?
> [1] https://github.com/apache/lucene-solr/pull/210#issuecomment-158335822
>
> If yes I think we should use the described approach that automatically
> closes pull request.
>
> Thanks,
> Ahmet
>
>
> On Saturday, November 21, 2015 10:25 PM, Karl Wright <da...@gmail.com>
> wrote:
> Hi all,
>
> We have a contribution that's structured as a github pull request (see
> CONNECTORS-1256). It's based off of a fork of the read-only manifoldcf
> github image on github. The problem is, I have no idea how to go about
> integrating this patch (4 github commits) into a local svn workarea.
> Documentation for doing this seems inadequate, that which I could find.
> I've tried using git svn, for instance, to set up a local workarea that the
> git changes might be applied to; it chugged for 45 minutes trying to do git
> svn clone without finishing; had to interrupt it.
>
> If somebody knows some tried-and-true small series of steps for doing this,
> please let me know. Barring that, I'd be happy with a way of generating
> the diffs for each of the patch commits, and applying them one at a time.
>
> Thanks,
> Karl
>
Re: Adding an extensive git pull request into ManifoldCF
Posted by Ahmet Arslan <io...@yahoo.com.INVALID>.
Hi Karl,
Does the bot thing described in [1] apply to manifoldcf ?
[1] https://github.com/apache/lucene-solr/pull/210#issuecomment-158335822
If yes I think we should use the described approach that automatically closes pull request.
Thanks,
Ahmet
On Saturday, November 21, 2015 10:25 PM, Karl Wright <da...@gmail.com> wrote:
Hi all,
We have a contribution that's structured as a github pull request (see
CONNECTORS-1256). It's based off of a fork of the read-only manifoldcf
github image on github. The problem is, I have no idea how to go about
integrating this patch (4 github commits) into a local svn workarea.
Documentation for doing this seems inadequate, that which I could find.
I've tried using git svn, for instance, to set up a local workarea that the
git changes might be applied to; it chugged for 45 minutes trying to do git
svn clone without finishing; had to interrupt it.
If somebody knows some tried-and-true small series of steps for doing this,
please let me know. Barring that, I'd be happy with a way of generating
the diffs for each of the patch commits, and applying them one at a time.
Thanks,
Karl