| === caraka_ is now known as caraka | ||
| morphis | currently trying to propose a merge for a git repo in launchpad but getting an error "lp:~morphis/libhybris/+git/libhybris-ubuntu is not mergeable into this repository", can someone help to figure out what the actual problem is? | 09:13 |
|---|---|---|
| morphis | cjwatson: can you help me? | 09:17 |
| wgrant | morphis: Which repository are you trying to merge into? | 09:28 |
| morphis | wgrant: https://code.launchpad.net/~libhybris-maintainers/+git/libhybris | 09:28 |
| morphis | https://code.launchpad.net/~morphis/libhybris/+git/libhybris-ubuntu/+ref/wip is the branch I want to merge | 09:28 |
| morphis | basically just trying it for now .. | 09:28 |
| wgrant | morphis: https://code.launchpad.net/~libhybris-maintainers/+git/libhybris isn't in any project. | 09:29 |
| wgrant | It's a personal branch unrelated to a project. | 09:29 |
| wgrant | The owner should visit https://code.launchpad.net/~libhybris-maintainers/+git/libhybris/+edit and switch it from "Personal" into the libhybris project, which will change the URL and allow merge proposals. | 09:29 |
| morphis | so you can only merge into projects? | 09:30 |
| morphis | wgrant: thanks, that worked: https://code.launchpad.net/~morphis/libhybris/+git/libhybris-ubuntu/+merge/277220 | 09:30 |
| wgrant | You can only merge between repositories in the same context. | 09:31 |
| wgrant | Context being project or package. | 09:31 |
| morphis | I see, that wasn't clear for me before | 09:31 |
| wgrant | +git is the Git equivalent of Bazaar's +junk. | 09:31 |
| morphis | wgrant: there is a lp:libhybris for bzr | 09:32 |
| morphis | what is the equivalent for git? | 09:32 |
| morphis | as right now it looks like this: https://code.launchpad.net/libhybris/+git | 09:32 |
| wgrant | morphis: https://code.launchpad.net/libhybris/+configure-code is the relevant page. | 09:33 |
| wgrant | There you can choose the default VCS, and the Bazaar branch and Git repository that get the short name. | 09:33 |
| wgrant | The default VCS chooses which list is displayed by default. | 09:33 |
| morphis | ok | 09:33 |
| wgrant | Git doesn't natively support lp: like Bazaar does, but you can configure it to know about it. | 09:34 |
| morphis | wgrant: yeah, that is what I did | 09:34 |
| wgrant | Setting the default repository makes "git clone https://git.launchpad.net/libhybris" etc. work. | 09:34 |
| morphis | wgrant: lp:libhybris currently is a auto-import branch, what is the way to deal with them when you decide to switch a project over completely to git? they just go away and would probably stay as an upstream branch? | 09:35 |
| wgrant | morphis: Well, it sort of fades into obscurity once you change the default, unless someone hits the "View Bazaar branches" link. | 09:35 |
| morphis | ok | 09:38 |
| sidi | A quick question about copying packages in a PPA and having Launchpad rebuild them from source.. I get the following error message: same version already has published binaries in the destination archive | 11:27 |
| sidi | Does that mean that when rebuilding, I *must* select another PPA since identical versions are not allowed? | 11:27 |
| sidi | I don't want to just copy the binary packages because I want to make sure they build properly (i.e. no deps changed) | 11:28 |
| cjwatson | sidi: right, in any given archive, files of the same name may only exist once | 11:32 |
| cjwatson | sidi: if you copied within the same archive and asked to rebuild, you'd end up with pool/main/f/foo/foo_1.0-1_amd64.deb needing to exist twice with different contents | 11:33 |
| cjwatson | sidi: so your choices are (a) don't rebuild (b) use a different PPA (c) upload with a different version rather than copying | 11:33 |
| sidi | cjwatson, thanks, will go with (c). It'd be awesome to have an option to rebuild and just bump the version number (ppax -> ppax+1) though, would have saved me 30-60 minutes :-) | 11:34 |
| Laney | https://launchpadlibrarian.net/225818700/buildlog_ubuntu-xenial-ppc64el.amide_1.0.5-4ubuntu1_BUILDING.txt.gz <- this looks weird | 15:22 |
| cjwatson | there are a few known memory corruption issues with the power builders - the incidence is rare but sadly non-zero | 15:27 |
| cjwatson | Laney: I've asked IS to investigate in case of obvious dmesg spam, but in the meantime I suggest just retrying | 15:29 |
| Laney | cjwatson: Will do - you don't need to keep any state? | 15:29 |
| cjwatson | Laney: I've extracted the relevant state, i.e. builder and build start time | 15:30 |
| cjwatson | but thanks for checking | 15:30 |
| Laney | Nod, okay | 15:30 |
| cjwatson | doubt anything else is relevant, I mean it go bang | 15:30 |
| Laney | I saw a similar one earlier but I retried that without checking | 15:31 |
| Laney | my bad | 15:31 |
| === maclin1 is now known as maclin | ||
| === maclin1 is now known as maclin | ||
| === heroux_ is now known as heroux | ||
| === Ursinha_ is now known as Ursinha | ||
| === clivejo_ is now known as clivejo | ||
| === maclin1 is now known as maclin | ||
| === maclin1 is now known as maclin | ||
| === maclin1 is now known as maclin | ||
| === caraka_ is now known as caraka | ||
| === caraka_ is now known as caraka | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!