Re: gbp import-orig's merge into master
On 20/09/15 16:07, Jonathon Love wrote:
hi,
i was attempting to incorporate a new upstream release of
r-cran-bayesfactor into the package repo, but i stuffed it up. i wasn't
expecting there to be changes to remote, and so didn't pull before starting.
i `gpb import-orig`ed the new release in, and then did a `push --all`
the upstream, and the pristine-tar branches pushed successfully, but the
master did not (due to my branch diverging from the remote).
normally when i screw git up, i just `git reset HEAD~n --hard`, where n
is a large number, and then pull again; this would let me start over
with `gbp import-orig`, but the pristine-tar and upstream are already
pushed to remote.
You could also `git fetch origin` and then `git rebase origin/master`.
That way you are not losing your commits in your current master branch.
i'm wondering what the equivalent steps are, to what `gbp import-orig`
does with merging upstream into master.
Upstream should already be updated and tagged then. Just quickly do:
git checkout upstream
and check the latest commit for the version number (should be 0.9.12).
To check the tagging, do:
git tag -ln
And look for a tag named upstream/0.9.12. If tagging did not work,
inside upstream just do:
git tag -a upstream/0.9.12
and leave the default commit message.
For merging upstream to master:
git checkout master
git merge upstream/0.9.12
Leave the default commit message. Then update the packaging content, the
minimum should be to add a new entry to d/changelog with the new
upstream version. Use `dch` for that. The source package version should
be 0.9.12-1.
Then test and tag with either `gbp buildpackage --tag-only` or manually
with:
`git tag -a debian/0.9.12-1 -m "r-cran-bayesfactor Debian release
0.9.12-1"`
Hope this helps,
Best regards,
Ghislain
Reply to: