Project

General

Profile

Bug #6606

Merge in Pull-Request on github freenas-plugins Repository

Added by Joshua Ruehlig almost 6 years ago. Updated about 3 years ago.

Status:
Resolved
Priority:
Nice to have
Assignee:
William Grzybowski
Category:
Middleware
Target version:
Severity:
New
Reason for Closing:
Reason for Blocked:
Needs QA:
Yes
Needs Doc:
Yes
Needs Merging:
Yes
Needs Automation:
No
Support Suite Ticket:
n/a
Hardware Configuration:
ChangeLog Required:
No

Description

I submitted a pull request on the github freenas-plugins repository https://github.com/freenas/freenas-plugins/pull/5
I just wanted to make sure it got the attention of someone.

Thanks,

History

#1 Updated by Jordan Hubbard almost 6 years ago

  • Category set to 33
  • Assignee set to Sean Fagan
  • Target version set to 49

#2 Updated by Sean Fagan almost 6 years ago

I don't know git well enough to know what that means.

#3 Updated by Joshua Ruehlig almost 6 years ago

what merging means? you basically would log into the freenas github account, review the proposed changes, comment, and when it's good click merge.

#4 Updated by William Grzybowski almost 6 years ago

you cant merge from github since its just a mirror from our repo hosted internally.

#5 Updated by Sean Fagan almost 6 years ago

Okay, now I understand more, but as William says, it doesn't work that way.

#6 Updated by Jordan Hubbard almost 6 years ago

Wow guys, no wonder we have trouble attracting external contributors with that kind of "can't do" attitude. :)

I'm a total git newb, myself, it seems pretty straight forward to add "git://github.com/josh4trunks/freenas-plugins.git" as a remote or simply pull it, which I did since his branch didn't seem particularly bad, though I suppose if I had been more clever I would have simply added his branch as a branch in our own upstream repo. I can still do that if his branch breaks things in master. What do you think, Joshua? Branch or just move forward and clean up our own rather weak freenas-plugins master branch by importing your stuff?

#7 Updated by Sean Fagan almost 6 years ago

  • Status changed from Unscreened to Screened

Not can't-do, more don't-know-how.

#8 Updated by Joshua Ruehlig almost 6 years ago

I'd prefer my changes for plex get merged in so that future updates built by others include my changes. As for the added plugins you can keep them in a separate branch but I think that might just complicate things. It's probably best to just keep everything in a single master branch so were all building off the same source.

I plan on contributing some more changes in the near future so hopefully we can get a system to allow easy merging. Specifically I plan on making a bunch of changes to the transmission plugin and also converting the tweakrcconf system to use sysrc instead.

#9 Updated by Sean Fagan almost 6 years ago

All I'm asking for is how to do it :).

If I could pull them into my local copy and then examine and merge, that's great. If I have to do a diff, that's less great but certainly doable.

#10 Updated by William Grzybowski almost 6 years ago

git remote add github https://github.com/freenas/freenas-plugins.git

You will need this in your .git/config:

[remote "origin"]
fetch = +refs/pull/*/head:refs/remotes/origin/pr/*

Add it to your existing [remote "origin"]

Then:

git fetch github

git merge origin/pr/5

#11 Updated by Sean Fagan almost 6 years ago

That doesn't work:

sef@build3:~/work/freenas-plugins % git merge origin/pr/5
merge: origin/pr/5 - not something we can merge

#12 Updated by William Grzybowski almost 6 years ago

I guess I meant github/pr/5

do git branch -r to show the branches.

#13 Updated by Sean Fagan almost 6 years ago

% git branch -r
github/master
github/pydio
origin/HEAD -> origin/master
origin/master
origin/pydio

#14 Updated by William Grzybowski almost 6 years ago

Then the code to your .git/config didnt work, place it in the github remote section instead.

#15 Updated by Joshua Ruehlig almost 6 years ago

Looking at https://github.com/freenas/freenas-plugins, it looks like Jordan merged in my changes + my alternate tree.
So, looks like this bug can be closed!

I'll just..
  • close the mentioned PR on github
  • fork freenas/freenas-plugins
  • work on my fork
  • submit Pull Requests and a Bug Report here whenever I feel necessary

Thanks

#16 Updated by Joshua Ruehlig almost 6 years ago

Crap, actually Jordan only merged in my alternative branch and not PR mentioned here. Also, I deleted my fork so I'll see if there's a way I can reopen the PR. =/

#17 Updated by Joshua Ruehlig almost 6 years ago

Ok, I think I fixed everything. Thank God for Virtual Box snapshots.

Please use this PR instead https://github.com/freenas/freenas-plugins/pull/6

#18 Updated by William Grzybowski almost 6 years ago

  • Status changed from Screened to Resolved
  • Assignee changed from Sean Fagan to William Grzybowski

#19 Updated by Joshua Ruehlig almost 6 years ago

thanks

#20 Avatar?id=14398&size=24x24 Updated by Kris Moore about 3 years ago

  • Target version changed from 49 to N/A

Also available in: Atom PDF