Hi Sean, Quoting Sean Whitton (2017-11-23 01:25:19) > On Thu, Nov 23 2017, Johannes Schauer wrote: > > Another section that could be improved in the dgit-maint-merge man page is > > "NEW UPSTREAM RELEASES" "When upstream releases only tarballs". > > > > After running "gbp import-orig" the master branch will contain the new > > upstream version but changes from debian/patches are not applied. The > > man page could expand on best practices on how to carry over changes > > from the last upstream version to the new upstream version. > Right. It should at least say that this action needs to be taken. > > What are the best practices you mention?
I was actually hoping that as the master mind behind the maint-merge workflow you would tell me that... XD What I did for my package was to manually collect my commits from the earlier upstream version and then re-apply these on top of the new upstream. But surely there should be a better way to handle this? > > And secondly, the section for "When upstream releases only tarballs" should > > at least contain as much information as the section "When upstream tags > > releases in git". So the former could also have some references to how to > > inspect upstream changes and how to run dch. > > Indeed it should. Thanks for agreeing. :) I don't really think I can be of much help here because I'm not familiar enough with git. Stuff like git merge-tree and merge-base is something I never used before. I'm just reporting this wishlist bug from a user perspective. :) Another small question: | "If you want to maintain a copy of your repository on alioth.debian.org, | you should push both the origin and the upstream branches:" Should that not be "both the master and the upstream branches to origin"? And a related side question (that maybe should also have an answer in the man page): What are the recommendations for the upstream branch? For "When upstream tags releases in git" you write "here is no need to maintain a separate 'upstream' branch" but does this also hold for "When upstream releases only tarballs"? Because if I don't push the upstream branch to anywhere, then the steps under "NEW UPSTREAM RELEASES" will fail because "gbp import-orig" doesn't see an upstream branch. So maybe the man page could also expand on the need for an upstream branch if upstream releases tarball and recommendations on where and when it should be pushed or how one can do without it. For example maybe the question can be answered whether the upstream branch can be pushed to dgit-repos or whether alioth has to be used for that. Thanks! cheers, josch
signature.asc
Description: signature
