Hi Benjamin, On Wed, Mar 28, 2018 at 09:37:05PM -0400, Benjamin Redelings wrote: > I've released a new version 3.0.3 of bali-phy, and I realize that I don't > understand how to manage the salsa repo using git. I've tried something > like this (mostly locally), but I'm pretty sure there is a way of doing this > with gbp that is recommended instead: > > git fetch upstream > git fetch upstream --tags > git checkout upstream > git merge -X theirs 3.0.3 > git tag upstream/3.0.3+dfsg > git checkout master > git merge upstream
I assume the problem is that you most probably intend to maintain the Debian repository in your upstream repository. I know that this is somehow possible but I'm lacking experience with this and thus can not give any helpful hint for this approach. We actually had some clones of upstream directories created by other maintainers but I was always running into problems with this (most probably just me!) and since those Debian maintainers got busy with other stuff I turned the repositories in what we consider default repository layout in Debian Med policy[1]. So if qou want to avoid any hassle I'd recommend to do the following: gbp clone [email protected]:med-team/bali-phy.git (may be you rename the resulting dir to bali-phy_debian ??) change to this dir and do uscan --verbose gbp import-orig --pristine-tar <new_bali-phy_tarball> This approach is well tested and if something unexpected might happen you can quickly get help here. BTW, I base my assumption that you are using your development Git on the fact that yesterday arrived lots of tags in the Salsa Git repository. I took the freedom to do for tag in `git tag | grep -v -e '^debian' -e '^upstream'` ; do git tag -d $tag git push origin :refs/tags/$tag done since these tags do not make any sense in the current repository on Salsa. > I also tried gbp dch, but it tried to create version 3.0.2+dfsg-2 instead of > 3.0.3+dfsg-1. Well, dch does not know what version bump you intend to do. Just use your editor to fix the version number. > Would it be possible to give me the quick overview? My > apologies for the basic nature of this question. Your question is perfectly valid and I'm happy to help. Just keep on with asking about any problem you might face. Hope this helps Andreas. [1] https://debian-med.alioth.debian.org/docs/policy.html#git-repository-structures -- http://fam-tille.de
