[mythtv] rpm build of master using mockchain. git help needed
John Pilkington
johnpilk222 at gmail.com
Sat May 12 14:28:28 UTC 2018
Hi: I've been trying to apply Gary's update of his package builder, but
haven't used git in a build process before and it isn't cooperating.
This gives the URL but doesn't work. I've tried others.
git checkout master; git cherry-pick -x
https://github.com/garybuhrmaster/packaging/commit/009cbba58bc6f34d920de40bcfe7741712ccbb60
Already on 'master'
Your branch is up-to-date with 'origin/master'.
fatal: bad revision
'https://github.com/garybuhrmaster/packaging/commit/009cbba58bc6f34d920de40bcfe7741712ccbb60'
What incantation should I be using?
Thanks,
John P
----------------
Some progress:
[john at HP_Fed mythtv]$ git remote add packaging
https://github.com/garybuhrmaster/packaging
[john at HP_Fed mythtv]$ git fetch packaging
warning: no common commits
remote: Counting objects: 428, done.
remote: Compressing objects: 100% (23/23), done.
remote: Total 428 (delta 6), reused 30 (delta 6), pack-reused 397
Receiving objects: 100% (428/428), 80.95 KiB | 746.00 KiB/s, done.
Resolving deltas: 100% (262/262), done.
From https://github.com/garybuhrmaster/packaging
* [new branch] master -> packaging/master
[john at HP_Fed mythtv]$ git cherry-pick
1a8f8c2fe99fcff6c096fd29011ca1599ea9583a
error: could not apply 1a8f8c2fe9... Remove some commented out code
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
More information about the mythtv-dev
mailing list