On Fri, Sep 21, 2012 at 12:59 AM, Alex Harvey <alexharv...@gmail.com> wrote: > As far as submitting the patch I have got myself stuck in a corner using > GitHub. I did read CONTRIBUTING.md but apparently too quickly because I > missed the bit about the need to create a topic branch when I submitted my > patch for #14674. So I would really like to just blow everything away and > clone a new copy of facter, and create my topic branch properly this time. > Trouble is, I am waiting on the code review for #14674 and GitHub doesn't > easily let you create multiple forked copies of the repo. >
Being on the branch is nice, but not critical. It really matters if you are going to be continue to work on facter, though, otherwise your new commits start to show up in the pull request that you submitted. There should be no need to creating a new fork to fix this problem. >From your original fork you should be able to do (assuming you have upstream that points to the puppetlabs facter repo) git fetch upstream git checkout -b ticket/1.6.x/ensure-processor-calls-only-done-on-correct-platform upstream/1.6.x git cherry-pick 1.6.x^^^...1.6.x git checkout 1.6.x git reset --hard upstream/1.6.x That should pull all of your commits onto a new branch. Be certain that it has worked before you do that last command because that will throw away the commits on the 1.6.x branch (they are actually still around, but hard to get at). I also noticed that you reference ticket #14764 (https://projects.puppetlabs.com/issues/14764) in your commits. Are you sure that is the right bug? > So, I followed instructions by Adrian Short on how to create multiple forks > of a repository. But after following these instructions I seem to only have > the master branch in my second repo! I wonder can I simply delete my forked > repository https://github.com/alexharv074/facter? I don't really understand > git or GitHub that well so I'm not sure if the "pull request" resulted in a > copy of my changes being made somewhere. > > If not, what other options do I have here? Sorry, I should have read the > instructions more carefully the first time. > > Here is full documentation of what I did while following Adrian Short's > page. Maybe I'm just a few steps away from being able to submit my patch to > someone who understands git. :) > > Created a second empty repo called 'facter2.git' using the "New Repository" > button at GitHub. > > Cloned the puppet labs repository: > > -bash-3.2$ git clone https://github.com/puppetlabs/facter.git > facter.secondfork > Cloning into facter.secondfork... > remote: Counting objects: 9691, done. > remote: Compressing objects: 100% (3797/3797), done. > remote: Total 9691 (delta 5960), reused 9265 (delta 5622) > Receiving objects: 100% (9691/9691), 1.99 MiB | 172 KiB/s, done. > Resolving deltas: 100% (5960/5960), done. > > -bash-3.2$ cd facter.secondfork/ > > -bash-3.2$ git remote -v > origin https://github.com/puppetlabs/facter.git (fetch) > origin https://github.com/puppetlabs/facter.git (push) > > -bash-3.2$ git remote rename origin upstream > > -bash-3.2$ git remote add origin https://github.com/alexharv074/facter2.git > > -bash-3.2$ git remote -v > origin https://github.com/alexharv074/facter2.git (fetch) > origin https://github.com/alexharv074/facter2.git (push) > upstream https://github.com/puppetlabs/facter.git (fetch) > upstream https://github.com/puppetlabs/facter.git (push) > > -bash-3.2$ git remote set-url origin > https://alexharv...@github.com/alexharv074/facter2.git > > -bash-3.2$ git remote -v > origin https://alexharv...@github.com/alexharv074/facter2.git (fetch) > origin https://alexharv...@github.com/alexharv074/facter2.git (push) > upstream https://github.com/puppetlabs/facter.git (fetch) > upstream https://github.com/puppetlabs/facter.git (push) > > -bash-3.2$ git push -u origin master > Password: > Counting objects: 8662, done. > Delta compression using up to 32 threads. > Compressing objects: 100% (3262/3262), done. > Writing objects: 100% (8662/8662), 1.54 MiB | 337 KiB/s, done. > Total 8662 (delta 5161), reused 8647 (delta 5151) > To https://alexharv...@github.com/alexharv074/facter2.git > * [new branch] master -> master > Branch master set up to track remote branch master from origin. > > -- > You received this message because you are subscribed to the Google Groups > "Puppet Developers" group. > To view this discussion on the web visit > https://groups.google.com/d/msg/puppet-dev/-/dkGHVck9Sa8J. > > To post to this group, send email to puppet-dev@googlegroups.com. > To unsubscribe from this group, send email to > puppet-dev+unsubscr...@googlegroups.com. > For more options, visit this group at > http://groups.google.com/group/puppet-dev?hl=en. -- You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to puppet-dev@googlegroups.com. To unsubscribe from this group, send email to puppet-dev+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
