[ovs-dev] [PATCH 00/23] Convert next batch of docs to rST

Joe Stringer joe at ovn.org
Thu Nov 3 18:21:33 UTC 2016


On 3 November 2016 at 03:33, Stephen Finucane <stephen at that.guru> wrote:
> On 2016-11-02 17:57, Joe Stringer wrote:
>>
>> On 30 October 2016 at 06:29, Stephen Finucane <stephen at that.guru> wrote:
>>>
>>> This is the third conversion series. This one is larger yet again,
>>> though many of the docs are rather small. After this series, only the
>>> two tutorial docs in 'tutorial' require conversion (along with any
>>> unsuffixed files I may have missed).
>>>
>>> /me didn't realize there was quite this much documentation in the repo.
>>
>>
>> Hi Stephen,
>>
>> I was wanting to make a (very minor) doc change but since this much
>> larger series is on the list I thought it's best for this to go in
>> first. I tried to rebase my doc change against this series so it could
>> go in after this does and save you any effort of rebasing this series
>> and potentially losing my change. Unfortunately I had a bit of trouble
>> trying to apply this series, starting with "doc: Convert
>> rhel/README.RHEL to rST".
>
>
> Just to be sure, you've applied the remaining patch from the second series
> first, yes?
>
>   http://openvswitch.org/pipermail/dev/2016-October/081065.html

Ah, no :-) It wasn't mentioned in this cover letter so I didn't
realise that the series required other changes.

> After that, this series should still apply cleanly:
>
>   http://openvswitch.org/pipermail/dev/2016-October/081066.html
>
> I did a quick rebase and it still applied cleanly for me. Perhaps you could
> apply the patches using three-way merge to auto-resolve any conflicts?
>
>   curl https://patchwork.ozlabs.org/patch/688927/mbox/ | git am -3
>
> However...
>
>> I think that maybe the series needs a rebase against latest master. Is
>> this series also available via git somewhere? That would make it a
>> little easier for me to base my change on top.
>
>
> I'll also push my working branches to GitHub when this evening. You'll find
> them here once I do:
>
>   https://github.com/stephenfin/ovs

Thanks for checking. I'll try this out later on.



More information about the dev mailing list