Dear Utkarsh, Utkarsh Gupta wrote: > Sure thing, once you give a go-ahead, I'll edit the changelog entry > and shall push that to the salsa repository.
Ok, thanks! > > existing jessie branch in git. (It has no commit besides those being > > part of the master branch. Not sure why I or someone else has created > > it already.) > > There's no "jessie" branch on salsa, at least. Hmmm. $ git branch -av | fgrep jessie * jessie 80eaffb Upload to unstable as 4.2.1-3 remotes/origin/jessie 80eaffb Upload to unstable as 4.2.1-3 Might be because the remote "origin" originally pointed to Alioth and I just edited .git/config manually instead of doing the "remote rename/add" dance since the Alioth remote won't come back. > So I created one with the latest dsc (4.2.1-3+deb8u1) and added 2 > commits on top of it. Thanks for the effort, but this seems to have a separate git root (why?!?) instead of being simply based on the tag debian/4.2.1-3 which points to commit 80eaffbae4363a79987e0e9fc07d1df96e0abd83. I fixed it by cherry-picking and applying your relevant commits — with proper commit messages _NOT_ including the whole (!) debian/changelog in the commit message but just the relevant entry — on top of the old jessie branch and force pushed it. (And unless "gbp dch" is used, I prefer to keep debian/changelog in sync with the packaging changes and not adding debian/changelog entries in a separate commit. But I didn't merge those two commits of yours as I wasn't sure about the reasons for that and it's a style/workflow thing and might subject to taste.) > By importing the dsc and creating a branch out of it, the commit history, > I am afraid, is lost. I don't see why this is necessary nor how this could have happened at all. The task would have been so simple: $ git checkout -b jessie debian/4.2.1-3 $ gbp import-dsc --ignore-branch ../screen_4.2.1-3.dsc $ git push -u origin jessie $ git push --tags > Do you want to restore all that? I already fixed it (except for tags, but you didn't seem to have pushed the one expected tag anyways), because I was annoyed even before I read that far in your mail. https://salsa.debian.org/debian/screen/-/commits/jessie/ now has a proper history again. > I'll be happy to do that after checking out from master and then > applying +deb8u1 changes and then pushing mine on top of it, but I > don't see any value to it, really. Huh, "no value"?!? Sorry, but a proper versioning is _essential_. Regards, Axel (not amused) -- ,''`. | Axel Beckert <a...@debian.org>, https://people.debian.org/~abe/ : :' : | Debian Developer, ftp.ch.debian.org Admin `. `' | 4096R: 2517 B724 C5F6 CA99 5329 6E61 2FF9 CD59 6126 16B5 `- | 1024D: F067 EA27 26B9 C3FC 1486 202E C09E 1D89 9593 0EDE
signature.asc
Description: PGP signature
