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.

Sign up for GitHub

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

Jump to bottom

[Crystal patch 3 backport] Ignore import order on generated imports (#29) #31

Closed
wants to merge 1 commit into from
Closed

[Crystal patch 3 backport] Ignore import order on generated imports (#29) #31

wants to merge 1 commit into from

Conversation

sloretz
Copy link
Contributor

@sloretz sloretz commented Mar 7, 2019

Cherry pick of 68e6271

connects to ros2/rosidl_typesupport#45

@sloretz
Ignore import order on generated imports (#29)
4183f0c 
Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>
@sloretz sloretz added the in progress Actively being worked on (Kanban column) label Mar 7, 2019
@sloretz sloretz mentioned this pull request Mar 7, 2019
Closed
10 tasks
@jacobperron
Copy link
Member

@sloretz @nuclearsandwich I noticed that I also require #21 and #28 for back-porting Python Actions. master contains an additional two commits that fix other bugs; do you think it's easier to open a single PR syncing crystal with master?

@sloretz
Copy link
Contributor Author

sloretz commented Mar 8, 2019

master contains an additional two commits that fix other bugs; do you think it's easier to open a single PR syncing crystal with master?

The only one I'm not sure about backporting is #26 .

@jacobperron
Copy link
Member

The only one I'm not sure about backporting is #26 .

This is already in Crystal, no?

@sloretz
Copy link
Contributor Author

sloretz commented Mar 8, 2019

This is already in Crystal, no?

Gah, it is. I read the commit graph wrong :-/

@nuclearsandwich
Copy link
Member

nuclearsandwich commented Mar 8, 2019 •
edited
Loading

do you think it's easier to open a single PR syncing crystal with master?

crystal...master shows the PRs you mentioned (#21, #28 (which doesn't appear to have a merge or squash commit)) as well as #27 and #29.

I don't see an issue with including #27

Edited: #29 is backported by this PR. ☕ 😅

@jacobperron jacobperron mentioned this pull request Mar 8, 2019
Merged
@sloretz
Copy link
Contributor Author

sloretz commented Mar 8, 2019

Replaced by #32

@sloretz sloretz closed this Mar 8, 2019
@sloretz sloretz deleted the crystal-patch-3/backport-nested-actions branch March 8, 2019 21:38
@sloretz sloretz removed the in progress Actively being worked on (Kanban column) label Mar 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nuclearsandwich nuclearsandwich nuclearsandwich approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@sloretz @jacobperron @nuclearsandwich