Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Parse in collate order #324

Merged
merged 5 commits into from
Oct 5, 2015
Merged

Parse in collate order #324

merged 5 commits into from
Oct 5, 2015

Conversation

Geoff99
Copy link
Contributor

@Geoff99 Geoff99 commented Feb 23, 2015

Hi @hadley
These changes should ensure that roxygen2:::parse_package reads the .R files in collate order when it parses them, and thus resolve issue #323 .
More than happy to make any improvements or corrections needed.

setdiff can unduplicate the vector of filenames that is returned
by calling (the updated) package_files, instead of r_files
@Geoff99
Copy link
Contributor Author

Geoff99 commented Aug 5, 2015

Hi @hadley
Is there anything I need to do to finalise this pull request (so that roxygen2 parses documentation in collate order as well as sources it in collate order - see issue #323)? It's been ready for review a while now.
Or is it just not time yet to consider minor changes to roxygen2.
Thanks
Geoff

@hadley
Copy link
Member

hadley commented Aug 5, 2015

I'll look at it when I'm next working on roxygen2

@krlmlr
Copy link
Member

krlmlr commented Oct 2, 2015

Looks good to me.

@hadley
Copy link
Member

hadley commented Oct 4, 2015

Could you please add a bullet to NEWS?

@Geoff99
Copy link
Contributor Author

Geoff99 commented Oct 5, 2015

Bullet point about parse in collate order change has been added to NEWS.

@Geoff99
Copy link
Contributor Author

Geoff99 commented Oct 5, 2015

NEWS entry moved to be under the top most bullet point. (Apologies, forgot to bring my local git copy up to date before adding NEWS entry in original location).

hadley added a commit that referenced this pull request Oct 5, 2015
@hadley hadley merged commit 5262f2a into r-lib:master Oct 5, 2015
@hadley
Copy link
Member

hadley commented Oct 5, 2015

Thanks!

@Geoff99
Copy link
Contributor Author

Geoff99 commented Oct 5, 2015

My pleasure :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants