=== guiverc2 is now known as guiverc [11:33] hum, does anyone here has experience migration a vcs from bzr to git which has tag names including '~' and ':' which are invalid to git and any hint how to deal with those? [11:56] seb128: fwiw, the convention in debian is to transform ~ to _ and : to % [11:59] Last time I did conversions, I used bzr-fastimport or whatnot, but a patched version or else bad things would happen. It had an option to rewrite tag names I believe. brz is the python3 version, but I don't believe those bugs were ever fixed... [12:04] seb128, I converted a lot of bzr repositories to git recently. [12:04] https://github.com/bdrung/bdrung-scripts/#bzr2git [12:11] seb128: more details on the standard escaping scheme: https://dep-team.pages.debian.net/deps/dep14/ [12:29] bdrung, ginggs, rbasak, thanks! [12:48] Unit193, I guess I will need to try that [12:48] bzr2git doesn't seem to handle the tags issue [12:49] WARNING: not creating tag b'refs/tags/1:102.9.0+build1-0ubuntu1' as its name would not be valid in git. [12:50] seb128, maybe as workaround: add tags in bzr with the renamed charaters. Then convert. [12:51] bdrung, bzr fast-export has a '--rewrite-tag-names', I'm trying that [12:52] WARNING: tag b'refs/tags/1:102.9.0+build1-0ubuntu1' is exported as b'refs/tags/1_102.9.0+build1-0ubuntu1' to be valid in git. [12:52] better [12:53] https://bazaar.launchpad.net/~unit193/bzr-fastimport/deletion-fixes/revision/361 [12:53] seb128, great! [13:03] Unit193, thanks, you don't have an updated version that applies to the current version by any chance? ;) [13:04] Thankfully I haven't had to touch bzr in a few years. [13:04] :p [14:37] Unit193, the issue was fixed in the bazaar ubuntu package but seems to have regresser in breezy, I ended up doing the import in a bionic container... [14:39] bdrung, bzr2git worked fine at the end, I just added --rewrite-tag-names to l115 of the script, I don't know if it's right in every case but it worked for thunderbird [15:02] seb128, it's probably a good default for importing it into git [15:30] rbasak: out of curiousity, what does git-ubuntu do if an initial upload of a package has its Vcs-Git* fields in .changes? [15:30] *curiosity [15:31] rbasak: if I'm uploading a new package, maybe I want the rich history to be present from the beginning :-) [15:39] I think it'll ignore it. I hadn't really covered that edge case, sorry. [15:40] Also, there's a bug that the import fails to push if there's only one upload. Sorry! [15:40] https://bugs.launchpad.net/git-ubuntu/+bug/2012626 [15:40] -ubottu:#ubuntu-devel- Launchpad bug 2012626 in git-ubuntu "Importer fails to push when there's only one upload" [High, Triaged] [15:40] It's because then the changelog notes ref doesn't exist, because that's based on diff to previous. [15:40] It is definitely a bug that I need to fix, but a bit of a low priority. [16:25] rbasak: ack :) [16:39] rbasak, is that answer https://bugs.launchpad.net/ubuntu/+source/tzdata/+bug/2012599/comments/36 sufficient? [16:39] -ubottu:#ubuntu-devel- Launchpad bug 2012599 in tzdata (Ubuntu Kinetic) "tzdata 2023a/2023b/2023c release - Egypt restoring DST" [Critical, Triaged] [16:48] bdrung: the issue is that you're bundling changes in SRUs which, while they may be correct and appropriate to make in an SRU, effectively attempts to bypass SRU review because they're bundled as part of other changes, instead of having the opportunity for proper review, justification, and planning for QA as they would do in separate SRU bugs. [16:49] eg. if the translations are wrong and you decided to fix them, then great, but then "Update debconf template and translations to 2023c-2" is *not* the appropriate way to describe that. [16:51] rbasak, valid point that the explanation of the change isn't that well formulated. [16:52] bdrung: every deliberate change that is visible to users should have its own referenced SRU bug with an SRU justification [16:52] rbasak, and I should have put those in two lines. The "Update debconf template" is just by running the build. [16:54] (but just running debconf-updatepo is fine without its own SRU bug of course. Just a note in debian/changelog as you did is fine) [16:55] I'm sorry if that seems like a lot of work. But I don't think it's appropriate to make changes to stable releases without careful consideration of each change being reviewed by the SRU team. Using documentation in individual bugs is how we do that. That's how the policy stands today. [16:56] We do not try to fix every single bug in SRUs either - because it's a lot of work for two competent to have confidence and take reasonable steps to ensure we won't regress users. I think that's a reasonable position for us to take. [16:56] for two competent developers [16:58] I have to EOD now. But I did just accept python-tz to Jammy and Kinetic - thank you for that! [17:00] rbasak, would you be okay if I would open two more bug reports with the reasoning and reference them in the changelog or do you prefer to defer those regression fixed for another round of SRUs? [17:01] since these are IMO regression fixes of previous updates/SRUs. [18:14] bdrung: I think that's up to you. It depends on SRU review of the justification of those separate fixes as to how long they'll take, I think. [18:14] bdrung: I think SRU policy/procedure _requires_ separate bugs for separate fixes. But it's up to you what fixes you want to propose. [18:15] bdrung: if you propose them, then we might discuss the details after review. But without seeing the justification and any discussion, the SRU team isn't in a position to make a decision. [18:25] bdrung: I suppose if we want the SRU to land quickly, then it be better to defer them to a future round. [18:25] And I need to spend more time on other things :-/ [21:29] seb128: Yeah, it was in universe so I had access to it. :D