On Saturday, September 22, 2012 2:51:40 AM UTC+10, Andy Parker wrote: > > On Fri, Sep 21, 2012 at 12:59 AM, Alex Harvey > <[email protected]<javascript:>> > 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). >
Argh, I did all this with some minor variations and thought I'd got my repo into a sane state. Then I've played around and I'm afraid I think it's still completely wrong. -bash-3.2$ git branch -av 1.6.x 47fd300 Merge pull request #324 from haus/maint/1.6.x/fixup_install_rb * 13535_facter_uptime_can_be_wrong_on_AIX 871ecb5 [ahead 3, behind 21] refactor, change case of ProcessorCount for sunos Facter.add block for consistency. 14674_ensure_processor_call_only_done_on_correct_platform 871ecb5 refactor, change case of ProcessorCount for sunos Facter.add block for consistency. master e865cbe Merge remote-tracking branch 'origin/2.x' remotes/origin/1.6.x 871ecb5 refactor, change case of ProcessorCount for sunos Facter.add block for consistency. remotes/origin/1.6rc 5a3e537 Updating FACTERVERSION and CHANGELOG for 1.6.12 remotes/origin/2.x a47c37b Merge pull request #307 from Evan-Pierce/ticket/2.x/15585_ext-facts-parse-incorrectly-equal-sign remotes/origin/HEAD -> origin/master remotes/origin/gh-pages 693fad0 Automatic update of YARD documentation by Jenkins remotes/origin/integration/fact_definition e594f27 (#14623) Add warning for facts without definitions remotes/origin/master e865cbe Merge remote-tracking branch 'origin/2.x' remotes/upstream/1.6.x 47fd300 Merge pull request #324 from haus/maint/1.6.x/fixup_install_rb remotes/upstream/1.6rc 5a3e537 Updating FACTERVERSION and CHANGELOG for 1.6.12 remotes/upstream/2.x a47c37b Merge pull request #307 from Evan-Pierce/ticket/2.x/15585_ext-facts-parse-incorrectly-equal-sign remotes/upstream/gh-pages 693fad0 Automatic update of YARD documentation by Jenkins remotes/upstream/integration/fact_definition e594f27 (#14623) Add warning for facts without definitions remotes/upstream/master e865cbe Merge remote-tracking branch 'origin/2.x' I guess I need to learn git... > > 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? > Okay, I've made a typo there - it should be #14674, not #14764... Is blowing everything away and starting again, on both bugs, an option at this point? :) -- 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/-/EvJIyS_0q0QJ. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
