Re: 20180210 IRC meeting wrap-up
Hi Pino! On Sun, Apr 22, 2018 at 09:04:29PM +0200, Pino Toscano wrote: > Please invoke svn-all-fast-export with: > * --add-metadata, so each commit has the information about its SVN > commit (useful for history search) > * --svn-ignore, so at least basic .gitignore's are available (if there > were) --add-metadata added. Unfortunately the version of svn-all-fast-export which is installed on Alioth does not support --svn-ignore, and the version where this flag was added (1.0.10+git4158cb06-1) FTBFS with libsvn from wheezy. I also tried to run svn-all-fast-export on my own server instead of Alioth, but there it fails with assertion error. > Also, once a conversion is done and all the unwanted stuff removed, > please compress it using `git gc --aggressive --prune=now`: this way > it will have no spurious stuff in its .git, and take less space on disk > (for the joy of salsa, and all the users cloning them). I added two commands to my clean script: - for tag in $(git tag --list 'backups/*'); do git tag -d $tag; done - git gc --aggressive --prune=now > Also², some of the repositories converted are not needed: > - k3b: I guess I forgot to update the Vcs-* headers, will do it in the > next upload > - libkdcraw & libkexiv2: converted to git looong ago These two were removed from sid, so I am now also checking Vcs-Git in stable. k3b removed manually. > So, I reviewed the folling repositories, which can be reconverted and > cleaned as I wrote above, and pushed to salsa: > - ctemplate -> 3rdparty/ctemplate > - icemon -> 3rdparty/icemon > - kalternatives -> kde-extras/kalternatives > - kchmviewer -> kde-extras/kchmviewer > - kmymoney2 -> kde-extras/kmymoney > - kphotoalbum -> kde-extras/kphotoalbum > - kradio4 -> kde-extras/kradio4 > - kraft -> kde-extras/kraft > - lensfun -> 3rdparty/lensfun > - skrooge -> kde-extras/skrooge > - smb4k -> kde-extras/smb4k All done now. Should I delete their directories from SVN? > Few more issues I found: > > * icecc: > - the tag debian/0.7.14-1 has no parent: most likely it was copied with > manual cp (and not svn cp), but still I'd like this to be fixed > > * kio-gopher: > - please remove the "kio-gopher-" prefix from the tags > > * krename: > - the tag debian/3.0.14-1 and the 4 commits for it have no parents > - the tag debian/4.0.3-1 has no parents > - the experimental branch has no parent > > * rsibreak: > - the tags debian/0.9.0-1, debian/0.9.0-2, and debian/0.9.0-3 need the > epoch in their names (like done starting from debian/1%0.9.0-4) > - there are tags with no parent: debian/0.9.0_beta3, and > debian/0.10_beta1-1 > > I will review the remaining repositories, and the ones above with > issues fixed, next weekend (I cannot earlier). kio-gopher fixed manually. For the remaining packages I think the best solution is deleting the old tags from Salsa manually and maybe pushing the replacement tags. My next step would be bulk updating Vcs-* fields in all repositories on Salsa, migrated from both Git and Svn. -- Dmitry Shachnev signature.asc Description: PGP signature -- https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-kde-talk
Re: 20180210 IRC meeting wrap-up
In data lunedì 16 aprile 2018 10:08:21 CEST, Dmitry Shachnev ha scritto: > On Sun, Apr 15, 2018 at 08:09:19PM +0200, Pino Toscano wrote: > > > I am ready to push them to Salsa at any moment, and I have updated my > > > import [1] to the latest revision recently, but Pino (CCed) asked me to > > > wait a bit more until he reviews it. > > > > How where they converted? Where are the scripts/rules used for them? > > alioth.debian.org:~mitya57/generate_git_rules.py Please invoke svn-all-fast-export with: * --add-metadata, so each commit has the information about its SVN commit (useful for history search) * --svn-ignore, so at least basic .gitignore's are available (if there were) > > why am I poked to review stuff that makes no sense to > > convert? why do *I* have to check even this? > > I asked you to review just your repos, not *everything* :) Considering that, except from digikam and maybe kchmviewer, I'm the one still working with packaging on SVN, then basically it gets to everything... Also, once a conversion is done and all the unwanted stuff removed, please compress it using `git gc --aggressive --prune=now`: this way it will have no spurious stuff in its .git, and take less space on disk (for the joy of salsa, and all the users cloning them). Also², some of the repositories converted are not needed: - k3b: I guess I forgot to update the Vcs-* headers, will do it in the next upload - libkdcraw & libkexiv2: converted to git looong ago So, I reviewed the folling repositories, which can be reconverted and cleaned as I wrote above, and pushed to salsa: - ctemplate -> 3rdparty/ctemplate - icemon -> 3rdparty/icemon - kalternatives -> kde-extras/kalternatives - kchmviewer -> kde-extras/kchmviewer - kmymoney2 -> kde-extras/kmymoney - kphotoalbum -> kde-extras/kphotoalbum - kradio4 -> kde-extras/kradio4 - kraft -> kde-extras/kraft - lensfun -> 3rdparty/lensfun - skrooge -> kde-extras/skrooge - smb4k -> kde-extras/smb4k Few more issues I found: * icecc: - the tag debian/0.7.14-1 has no parent: most likely it was copied with manual cp (and not svn cp), but still I'd like this to be fixed * kio-gopher: - please remove the "kio-gopher-" prefix from the tags * krename: - the tag debian/3.0.14-1 and the 4 commits for it have no parents - the tag debian/4.0.3-1 has no parents - the experimental branch has no parent * rsibreak: - the tags debian/0.9.0-1, debian/0.9.0-2, and debian/0.9.0-3 need the epoch in their names (like done starting from debian/1%0.9.0-4) - there are tags with no parent: debian/0.9.0_beta3, and debian/0.10_beta1-1 I will review the remaining repositories, and the ones above with issues fixed, next weekend (I cannot earlier). Thanks, -- Pino Toscano signature.asc Description: This is a digitally signed message part. -- https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-kde-talk
Re: 20180210 IRC meeting wrap-up
Hi Pino and other kde-extras contributors! On Mon, Apr 16, 2018 at 11:08:21AM +0300, Dmitry Shachnev wrote: > > I'd say: > > - start with sources currently in unstable/testing (so stuff that most > > probably will get more work), in batches of 10 (so it can be reviewed > > more easily) > > - after that, go on to sources in stable but no more in unstable, since > > they might get changes in stable > > - then decide what to do about the rest > > As said above, I will do a bit more cleanup. The new version of my clean.sh script deletes all repositories that either: - have no debian/changelog file in HEAD; - are not present in stable, unstable or experimental; - or have Vcs-Git field in unstable. This leaves us with just 30 repos (instead of previous 98): https://anonscm.debian.org/git/users/mitya57/kde-extras/ Additionally, I have deleted the ‘upstream’ branches in these repos. With regards to backups/$oldbranchname@$revision branches, I think they should be looked at individually, and it should be quite easy to delete them from Salsa after the move. If you have no objections on my latest version, I am going to import it to Salsa before end of this week and make Svn read-only after that. -- Dmitry Shachnev signature.asc Description: PGP signature -- https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-kde-talk
Re: 20180210 IRC meeting wrap-up
Hi Pino, On Sun, Apr 15, 2018 at 08:09:19PM +0200, Pino Toscano wrote: > > I am ready to push them to Salsa at any moment, and I have updated my > > import [1] to the latest revision recently, but Pino (CCed) asked me to > > wait a bit more until he reviews it. > > How where they converted? Where are the scripts/rules used for them? alioth.debian.org:~mitya57/generate_git_rules.py alioth.debian.org:~mitya57/import.sh alioth.debian.org:~mitya57/clean.sh > > [1]: https://anonscm.debian.org/git/users/mitya57/kde-extras/ > > I am now sure which criterias you chose, but these repositories include > stuff not present in Debian, some of them removed many years ago, and > few even things never uploaded... Ok, I will remove repositories that are neither in stable nor in sid. > why am I poked to review stuff that makes no sense to > convert? why do *I* have to check even this? I asked you to review just your repos, not *everything* :) > I'd say: > - start with sources currently in unstable/testing (so stuff that most > probably will get more work), in batches of 10 (so it can be reviewed > more easily) > - after that, go on to sources in stable but no more in unstable, since > they might get changes in stable > - then decide what to do about the rest As said above, I will do a bit more cleanup. > Random things I found out: > > * there are tags backups/$oldbranchname@$revision, which should be > checked whether they makes sense as branch names instead, or just > drop them otherwise > > * rsibreak: > - the tag debian/0.9.0_beta3 with no parents nor children Because it was created in an unusual way: https://anonscm.debian.org/viewvc/pkg-kde?view=revision&revision=12873 “move old kde4 packaging to a tag” > - there are two initial empty commits The conversion script creates a Git commit for every Svn commit. Is this really a problem? > - the branch upstream has basically only empty commits Good catch, I will delete upstream branches. > * kmplayer: > - the branch experimental (that merges to master) starts from nothing Again, it is an issue with the original SVN repo. The directory was created, not copied from trunk: https://anonscm.debian.org/viewvc/pkg-kde?view=revision&revision=3483 > and I did not check more than other 10 repositories or so. -- Dmitry Shachnev signature.asc Description: PGP signature -- https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-kde-talk
Re: 20180210 IRC meeting wrap-up
In data domenica 8 aprile 2018 21:08:03 CEST, Dmitry Shachnev ha scritto: > Hi Steve! > > On Sun, Apr 08, 2018 at 01:18:56PM -0500, Steve Robbins wrote: > > Hi. What is blocking upload of svn-converted repositories? Is there > > anything I can do? > > I am ready to push them to Salsa at any moment, and I have updated my > import [1] to the latest revision recently, but Pino (CCed) asked me to > wait a bit more until he reviews it. How where they converted? Where are the scripts/rules used for them? > [1]: https://anonscm.debian.org/git/users/mitya57/kde-extras/ I am now sure which criterias you chose, but these repositories include stuff not present in Debian, some of them removed many years ago, and few even things never uploaded... why am I poked to review stuff that makes no sense to convert? why do *I* have to check even this? I'd say: - start with sources currently in unstable/testing (so stuff that most probably will get more work), in batches of 10 (so it can be reviewed more easily) - after that, go on to sources in stable but no more in unstable, since they might get changes in stable - then decide what to do about the rest Random things I found out: * there are tags backups/$oldbranchname@$revision, which should be checked whether they makes sense as branch names instead, or just drop them otherwise * rsibreak: - the tag debian/0.9.0_beta3 with no parents nor children - there are two initial empty commits - the branch upstream has basically only empty commits * kmplayer: - the branch experimental (that merges to master) starts from nothing and I did not check more than other 10 repositories or so. -- Pino Toscano signature.asc Description: This is a digitally signed message part. -- https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-kde-talk
