| gour | morning | 06:22 |
|---|---|---|
| gour | is it possible to continue using brz with the repo which was originally cloned/pulled with git? | 06:23 |
| gour | i tried 'brz pull' on my repo and got the following: https://pastebin.com/U8GcUQsb | 06:25 |
| jelmer | gour: should be fixed if you update your version of bzr-git | 10:31 |
| gour | jelmer: ok, thanks | 10:34 |
| gour | jelmer: now i get this: https://paste.fedoraproject.org/paste/~ubZeJ0wGMk8fIv6nICrqw | 10:40 |
| jelmer | gour: you need a newer dulwich as well | 10:54 |
| jelmer | gour: (and possibly a newer bzr) | 11:15 |
| gour | jelmer: i already updated brz, now pulled and re-install all of them, but still get 'brz: ERROR: ImportError: cannot import name LOCAL_TAG_PREFIX' | 12:09 |
| jelmer | gour: try pulling from dulwich now? Sorry, forgot to push that last change | 12:10 |
| gour | jelmer: now it's ok. excuse me for bothering you | 12:16 |
| gour | although now after pull i get: "brz: ERROR: These branches have diverged. Use the missing command to see how...", but that's probably another non-brz-related issue | 12:18 |
| jelmer | gour: no worries, I'm curious why our CI didn't catch this particular issue | 12:18 |
| jelmer | gour: do you have local changes? | 12:19 |
| gour | jelmer: i bet i didn't have, except in case i just did a local build | 12:20 |
| jelmer | gour: local committed changes, I mean | 12:20 |
| gour | jelmer: yeah, i understand...it could be that i did perform local build on freshly cloned repo without commit...now cloning from the scratch | 12:21 |
| gour | jelmer: now i did 'brz pull' into another repo originally fetched via git and get the same msg, although 'git status' shows everything is clean? | 12:28 |
| jelmer | gour: are you specifying an explicit URL to pull from? | 12:33 |
| gour | jelmer: nope | 12:34 |
| jelmer | gour: is the URL it says it's pulling from what you would expect? are there other branches in the remote URL? | 12:34 |
| gour | jelmer: see https://pastebin.com/7ASkhwJa | 12:35 |
| jelmer | gour: ah, restic is a public repo? I can try and reproduce it here | 12:38 |
| gour | jelmer: yes, https://github.com/restic/restic | 12:42 |
| gour | so, first cloned via git and now tried to update by pulling with brz | 12:44 |
| jelmer | gour: oh, the URL is invalid | 12:44 |
| jelmer | it's a rsync-style URL, which bzr doesn't understand | 12:44 |
| jelmer | try git+ssh://git@github.com/restic/restic | 12:45 |
| * jelmer files a bug | 12:45 | |
| jelmer | hey gour_ | 15:00 |
| jelmer | gour_: so I've fixed the URL issue (change is landing now), but I can't reproduce the DivergedBranches issue | 15:01 |
| === gour_ is now known as gour | ||
| gour | jelmer: when the changes is going to be landed,i can try pull some other git-cloned repo | 15:08 |
| gour | only brz-git is affected? | 15:09 |
| jelmer | brz-git and dulwich | 15:11 |
| jelmer | I'll let you know when it lands | 15:11 |
| gour | thank you | 15:13 |
| jelmer | gour: changes have landed; you'll need a new brz-git & a new dulwich | 15:36 |
| gour | jelmer: tried with another github project and got the same diverged branches | 15:43 |
| jelmer | gour: what does "git pull origin HEAD" report if you try that instead? | 15:45 |
| gour | jelmer: https://pastebin.com/RuDNSxtH | 15:47 |
| jelmer | gour: thanks, reproduced now | 15:51 |
| jelmer | gour: pushed a fix to lp:brz-git, can you try again? | 16:31 |
| gour | jelmer: excuse me, was afk...now it works, thanks a lot!! | 18:28 |
| jelmer | \o/ | 18:28 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!