| === G_ is now known as G | ||
| LocutusOfBorg | nacc, I'm going to upload libguestfs if you want | 09:39 |
|---|---|---|
| === tlyu_ is now known as tlyu | ||
| === Foxtrot is now known as foxtrot | ||
| bdrung | mapreri, hi. i am trying to convert u-d-t from bzr to git | 17:43 |
| mapreri | bdrung: I've already done it/I'm on it. | 17:43 |
| mapreri | I'm trying to close all bzr-based MRs. | 17:43 |
| bdrung | cool.because i stumbled over https://bugs.launchpad.net/ubuntu/+source/bzr-fastimport/+bug/1682357 | 17:44 |
| ubottu | Launchpad bug 1682357 in bzr-fastimport (Ubuntu) "Unicode decode problems with fast-export" [Undecided,New] | 17:44 |
| mapreri | isn't that fixed in sid? | 17:44 |
| mapreri | mhh | 17:44 |
| mapreri | I thought I did an upload fixing that bug last week(s) | 17:44 |
| bdrung | can you push your git repo? | 17:45 |
| mapreri | it's already pushed | 17:45 |
| bdrung | I am running bzr-fastimport 0.13.0+bzr361-1 on zesty | 17:45 |
| bdrung | cool. let me check it out | 17:45 |
| mapreri | https://git.launchpad.net/ubuntu-dev-tools?h=master | 17:45 |
| mapreri | bdrung: I'm manually keeping it synced with bzr until I can do an upload switching the VCS. | 17:45 |
| mapreri | then will empty the bzr repo leaving reference about the move. That's the plan at least. | 17:46 |
| mapreri | (anything wrong with it? :)) | 17:46 |
| mapreri | bdrung: => https://tracker.debian.org/news/844138 | 17:46 |
| mapreri | bdrung: can you confirm (again) that with that fix from artful that bug is actually fixed? If so I would reassing/merge the bugs (both in debian and ubuntu…) | 17:48 |
| bdrung | i can try it | 17:48 |
| bdrung | commit bedce37bf87d3dc98b9c20845b2d839c0ac006c3 | 17:49 |
| bdrung | Author: mattia@debian.org <> | 17:49 |
| bdrung | ^ that email address should be fixed | 17:49 |
| mapreri | happiness | 17:50 |
| mapreri | bdrung: that would require force pushing, not really nice (at the very least nacc already clone the repository and did a git-based MR…) | 17:50 |
| mapreri | is that actually problematic for some tool, apart from forbidding properly link of the commit with my user? | 17:51 |
| bdrung | since we didn't officially switched to git, a force push is okay IMO | 17:52 |
| bdrung | i found more commits with <> as email | 17:53 |
| mapreri | I must have fucked up with some tool during the conversion | 17:54 |
| bdrung | http://paste.debian.net/930094/ | 17:54 |
| bdrung | git log | grep ^Author | sort | uniq | grep '<>' | pastebinit | 17:54 |
| mapreri | meh https://paste.debian.net/plain/930095 | 17:55 |
| bdrung | "git log | grep ^Author | sort | uniq" show some "duplicates" that could be unified | 17:56 |
| mapreri | That's coming from bzr metadata right? | 17:56 |
| mapreri | (it looks nice colored as I have it here ;)) | 17:56 |
| bdrung | so some fixup could needs to be done afterwards | 17:56 |
| bdrung | IIRC I had a script for that | 17:57 |
| mapreri | If you can, please do it (and apologize for probably breaking https://code.launchpad.net/~ddstreet/ubuntu-dev-tools/+git/ubuntu-dev-tools/+merge/322863 !) | 17:57 |
| mapreri | but personally I wouldn't care so much about broken email in Author.. | 17:58 |
| bdrung | since we do a migration, now is the best time to repair it. later we are not allowed to rewrite the history any more | 17:59 |
| mapreri | true | 17:59 |
| bdrung | FYI I want to do similar changes to u-d-t than I did on https://anonscm.debian.org/cgit/collab-maint/distro-info.git | 18:00 |
| bdrung | (flake8 & pylint) | 18:00 |
| mapreri | bdrung: I've now pushed the last two commits, feel free to do whatever, but please tell me fix my local clone if you force push. | 18:03 |
| bdrung | k | 18:04 |
| bdrung | my grep foo found the scripts I used | 18:04 |
| mapreri | bdrung: did you try the python-fastimport thing? | 18:05 |
| bdrung | not yet | 18:05 |
| mapreri | bdrung: oh, and please make sure your script takes care of appropriately fixing the tags too… | 18:07 |
| Unit193 | bdrung: Try https://sigma.unit193.net/source/bzr-fastimport_0.13.0+bzr361-1aegir1.dsc btw. | 18:38 |
| Unit193 | You may not need it, but when converting 'git reset' and 'git status', followed by 'bzr status' | 18:39 |
| bdrung | rewrite script is working now. i have to fill out the repair map now | 18:49 |
| mapreri | Unit193: is that .dsc bzr-fastimport with the patch attached to that bug? | 18:57 |
| mapreri | I think the fix done in python-fastimport should be enough without touching bzr-fastimport. | 18:57 |
| Unit193 | mapreri: That's the one that fixes ~3 bugs where files come back from the dead (after deleted, but as I said he may well not need it.) | 18:58 |
| mapreri | oh, well, let's just have bzr die. | 18:58 |
| Unit193 | That is, during fastexport the files are in the new git history as not deleted. | 18:59 |
| Unit193 | mapreri: Thanks for the merge, btw. | 19:01 |
| mapreri | np | 19:02 |
| Unit193 | (As a simple testcase: bzr branch lp:ubuntu-bots && cd ubuntu-bots && git init && bzr fast-export --rewrite-tag-names --plain | git fast-import && git reset then tell me that the git import was correct! :P ) | 19:05 |
| bdrung | my conversion script: http://paste.debian.net/930111/ | 19:09 |
| bdrung | final conversion is running | 19:35 |
| bdrung | mapreri, pushing rewritten history | 19:40 |
| bdrung | branches & tags pushed | 19:41 |
| Zta | Hi. Anyone know if it is possible to make an unattented installation ISO of Ubuntu Server 16.04? I've been searching, and it seem like it used to work in 14.04, but no one is able of getting rid of the first "Select Language" screen in 16.04. | 19:52 |
| Unit193 | mapreri: I don't suppose I've convinced you to try that? :P | 19:52 |
| Zta | Ah, got it. | 20:39 |
| mapreri | bdrung: great, thank you! | 20:41 |
| mapreri | ddstreet: after bdrung rebaed all of the ubuntu-dev-tools git repository, could you please rebase also your own branches for https://code.launchpad.net/~ddstreet/ubuntu-dev-tools/+git/ubuntu-dev-tools/+merge/322863 - to avoid funny things when eventually merging? | 20:42 |
| mapreri | rebased* | 20:42 |
| mapreri | Unit193: nah. 1) long passed EOD 2) this discussion actually reminded me that I wanted to *de*install it from my system, hoping I won't need it anymore ;) | 20:43 |
| bdrung | mapreri, i pushed some additional commits. the good part: the pylint checks works again. the bad part: it finds some issues | 20:47 |
| === dja|away is now known as dja | ||
| Unit193 | mapreri: Dowh, dang. I know the feeling, but in Ubuntu too many still use it. :/ | 23:30 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!