[00:43] I have created a PPA which now contains a compiled package. Having retrieved the GPG key using apt-key and added the PPA to the archives on my computer (remembering to apt-get update), I can find this package using apt-get search. But from inside Synaptic the package doesn't appear even though I search for its precise name. What could possibly be the reason for this? [00:44] I mean apt-cache search, not apt-get search. [00:45] AskHL_: Did the package successfully build? [00:45] Which is your PPA? [00:46] wgrant, it built successfully. Actually I can find it from by navigating the menus in Synaptic [00:46] ...find it from the lists by navi... [00:47] I don't use Synaptic, but IIRC it has some extra search indices that might not be updated frequently. [00:47] It's just that it doesn't turn up in a search [00:48] wgrant, thank you. I'll take a closer look at what synaptic is doing. [00:50] Ahh, of course. It must be because of the "quick search" feature not updating immediately. An ordinary search does in fact work. Thanks again [01:28] Is it just me, or is Launchpad (edge) mega slow? [01:30] jkakar: Pretty quick (Launchpad-relative) for me. [01:30] wgrant: Cool, thanks. [01:31] I'm seeing 18-24s page loads. :/ [01:32] jkakar: Which pages? [01:32] wgrant: project overview and individual bug pages. [01:32] Here it's < 5s for most pages, which is better than normal... [01:32] Interesting, a milestone page with 112 bugs just loaded in 5.8s. [01:33] Lots of that was probably SQL time, too. [01:33] Ah well, yay for a noisy internet connection. === ripps_ is now known as ripps [06:10] hey all [06:10] question: how do I delete a project I created in LP? [06:10] mthaddon, I just sent you an email... [06:10] not sure if you're on or not. [06:12] SodaPhish_: Ask a question at https://answers.launchpad.net/launchpad/+addquestion [06:12] wgrant, aight. SO, emailing mthaddon wasn't the right course? ;-) [06:13] emailing a specific person that could be on leave or anything is never the right course ;) [06:13] I know... I was being smug [06:13] or glib [06:14] or something [06:18] wow, lively group. [06:18] okay, so I posted my questions... now I'll leave you all to your silence. [06:19] Ah... sweet, sweet silence. [06:27] spiv: HI! [06:28] Good afternoon. [06:28] you mean morning [06:28] It's barely after midnight [06:30] If by "barely" you mean, "sixteen and a half hours", sure ;) [06:30] 01:30 here :P [06:31] doing a paper and then taking an exam 08:00 [06:36] ah, the global community :) [06:36] @now [06:37] micahg: write my paper [06:37] * micahg is still at work and it's after midnight :) [06:37] so - it sounds like LP is running w/o issues and w/o users asking questions [06:37] nice quiet day on irc? [06:38] almost a 5 hour gap in here... [06:56] Did dev.lp.net just break? [06:59] The Launchpad ancillary wikis ({dev,help}.launchpad.net) seem to have just gone offline [07:00] spiv: quiet day over? [07:03] MTecknology: apparently! [07:23] hello [07:23] I am having massive issues reporting bugs since launchpad has been upgraded to 3 [07:23] I want to report a bug against open-iscsi [07:23] https://bugs.launchpad.net/ubuntu/+source/open-iscsi [07:23] how can I do this? I click on report bug it sends me to the wiki, which doesnt work [07:25] yann2: this is a question for #ubuntu-bugs, but you can use ubuntu-bug open-iscsi [07:26] its for a server... [07:26] are you on an ubuntu machine right now? [07:27] yes [07:27] you can still use ubuntu-bug [07:27] well it will send my own machine details [07:27] and it doesnt even have openiscsi installed [07:27] that should be ok, I think [07:28] yeah, it'll just note you don't have it installed [07:28] they are working on bug submission from the command line [07:28] and its not the same version of ubuntu neither === thekorn_ is now known as thekorn [07:34] Is there a LOSA around? {dev,help}.lp.net are down [07:35] maxb: It's known === thekorn_ is now known as thekorn [08:26] yann2: Why not run ubuntu-bug on the server...? [08:26] wgrant > if its the same than on my laptop it s a GTK program [08:27] yann2: It also has a CLI frontend. [08:38] what package is it in wgrant ? [08:38] is it in main? [08:39] It's on the CDs and installed by default (even on servers, I believe), so yes, it is in main. [08:39] I presume it's in the apport package. [08:40] It is. [08:40] yann2: ^^ [08:42] yhamon@nomachine:~$ ubuntu-bug [08:42] -bash: ubuntu-bug: command not found [08:42] yhamon@nomachine:~$ apt-cache search --names-only ubuntu-bug [08:42] yhamon@nomachine:~$ [08:42] ah apport [08:42] ok :) [08:43] It's in the server and uec seeds. Which release is that? [08:44] hardy, its in apport [08:44] Ah. Might not have been installed by default back then. [08:44] but then it wont work for machines that dont have access to internet :) [08:45] What would you like to do? Your options are: [08:45] ... [08:45] K: Keep report file for sending later or copying to somewhere else [08:45] That is probably why that option exists. [08:46] ok thx [08:47] rah it crashes my console [08:48] bah, I give up. [08:48] thanks for the help [08:48] Use the link at the bottom of the wiki page. [08:48] That will let you report bugs without apport. [08:49] thanks [08:49] But it is strongly, strongly discouraged. [08:50] I want to report a bug that says "openiscsi should not disconnect shares on upgrade" [08:50] I don't understand how much additional infos would be necessary [08:50] The version of the package, for one thing. [08:51] I used to be able to select the ubuntu version int he web interface :P [08:52] No. [08:52] That was never possible. [08:52] would have been a good idea 0:-) [08:53] Certainly. [08:53] But apparently Bugs devs disagree... [08:54] well understand me, I used to be able to do something in a way, now I need to install 5MB on my production servers, copy files around, and well, it doesnt even work [08:54] it just seems more complicated and I wonder how many people will just stop reporting bugs [08:55] sure, most power users wont mind :/ [08:55] yann2: I'm pretty sure console base apport will be a feature in lucid === micahg1 is now known as micahg [08:55] Note that many Ubuntu developers vehemently disagree with the enforced ubuntu-bug usage. [08:55] then hoy do you report bugs that are not related to a package in particular? :( [08:55] micahg: It works fine in Karmic... [08:56] wgrant: ok, but I meant for LTS [08:56] yann2: probably go in another project [08:56] you can come in #ubuntu-bugs and ask :) [08:56] I wanted to report that there were two CD burners in karmic desktop at some point [08:57] nautilus and brasero, both in different places in the menu, but doing the same thing [08:57] yann2: nautilus is the file manager with a burn feature I guess [08:57] but brasero is the actual burner [08:58] you actually had "Application accessories Nautilus cd writer" and "applications Sound&video Brasero cd burner" [08:58] or something like that [08:58] oh, you could probably report against ubuntu-desktop [08:58] tried [08:59] well I tried using the web interface... :) [08:59] ubuntu-bug ubuntu-desktop [08:59] micahg: Er, why? [09:00] why what? if he wants to report a bug against installing 2 burners for ubuntu-desktop [09:00] Nautilus and Brasero must both be installed, so it's not a metapackage problem. [09:00] wgrant: why? [09:01] Nautilus only handles burning files. [09:01] ah, so there is no bug like I said originally [09:01] There is a bug. [09:01] There are two shown. [09:01] But it is not a metapackage bug. [09:02] huh? [09:02] (it was a while back :) ) [09:02] if they are installed, shouldn't they be shown? [09:02] and shouldn't this actually move to #ubuntu-bugs [09:02] There is no point having two items. [09:03] And I don't have the Nautilus CD burner stuff; are you sure you don't have a residual nautilus-cd-burner installation? [09:03] nah it was a karmic install like 3 weeks ago in a vm [09:13] it gets OT but how did you manage to install both as brasero conflicts nautilus-cd-burner? [09:14] Hello! Can I get "debug debs" from a ppa, similar to what https://wiki.ubuntu.com/DebuggingProgramCrash says for the primary ubuntu archives? [09:15] hi all [09:15] alkisg_work: Discussing it literally right now. [09:15] Heh : [09:16] Thanks wgrant, I'll downgrade to the version that's in the primary archives [09:16] I'm looking at the integrated code review process in launchpad [09:16] so reviews are linked to a branch [09:16] alkisg_work: so the short answer is, not right now, but wgrant will make your wish come true [09:16] what happens when a branch that had reviews linked to it is deleted? [09:16] oSoMoN: The reviews are deleted too. [09:16] But you don't have to delete branches. [09:17] I don't particularly like the fact that they can be deleted. [09:17] Most projects do not delete them. [09:17] well one may want to delete a particular branch, but I agree that in general there's no need to do that [09:18] thanks for the answer [09:19] Uh, would it be possible for someone to help me find a direct http link to the debug version of "italc-client" .deb for jaunty? He'd save me from having to modify the sources of a lot of client PCs... [09:19] alkisg_work: The ddeb, you mean? [09:19] wgrant: Yes, I think so [09:20] (I'd like to produce a backtrace) [09:20] alkisg_work: Why do you want it? Why not just submit the crash and let it be retraced automatically? [09:20] wgrant: I don't get a crash dump [09:20] Ah. [09:20] Uhm... could I modify some setting to get a crash dump? [09:21] You could. But it's easy enough to grab the ddeb. [09:22] (btw, that's what I'm getting: http://pastebin.ubuntu.com/293711/) [09:22] *** glibc detected *** ica: corrupted double-linked list: 0x0a3abe30 *** [09:23] http://ddebs.ubuntu.com/pool/main/i/italc/italc-client-dbgsym_1.0.9.1-0ubuntu9_i386.ddeb [09:23] ======= Backtrace: ========= <-- is that the same backtrace that the debug ddeb will give me? [09:23] Thanks a lot wgrant! May your wishes also come true :) === jml changed the topic of #launchpad to: Read https://help.launchpad.net for help | Help contact: jml | Join https://launchpad.net/~launchpad-users | This channel is logged: http://irclogs.ubuntu.com/ | Launchpad is open source: see channel #launchpad-dev === yann__ is now known as Yann2 [09:47] Hmm. The "Affects me too" feature still doesn't seem to stop random "Me too" comments. [09:47] It's not exactly obvious. [09:48] Nor does it do anything. [09:48] yes, a count of affects me too would be nice :) [09:51] * micahg is filing a bug for that now [09:52] bug 451988 [09:52] Launchpad bug 451988 in malone "a count of "affects me too" would be nice for triagers" [Undecided,New] https://launchpad.net/bugs/451988 [09:53] I think there are several of those already. [09:53] Go and comment 'me too' on them. [09:53] I didn't see any [09:53] I searched for me too [09:53] count [09:53] and wishlist bugs [09:53] Hmm. === micahg1 is now known as micahg [10:02] bigjools, what ought I do for https://answers.edge.launchpad.net/launchpad/+question/74247 [10:05] jml: assign to losas [10:06] and they will disable [10:06] bigjools, ok. [10:06] bigjools, thanks. [10:16] hmmm. [10:16] I wonder if I should put launchpadlib into lpx [10:17] Quite possibly. [10:17] How is the CHR marathon going? [10:17] wgrant, I keep getting distracted by other things. [10:19] * bigjools knows that feeling [10:27] also, the coding task I wanted to do to reduce CHR load has turned out to be a lot bigger than I imagined. [10:27] jml: for next week's CHR, maybe we should try having someone that hasn't that much responsibilites in general :) a week of CHR is similar like having vacation, in the sense that you need to plan for someone else to take care of your normal responsibilities. [10:28] the more responsibilites you have, the more you need to prepare in advance [10:28] BjornT, yes. I strongly agree. [10:46] also [10:47] vocabularies are almost always a terrible idea [10:48] Most of the time I want to link to a bug, say, I don't already know the number. [10:57] danilos, Ursinha: do either of you know what's going on with https://answers.edge.launchpad.net/launchpad/+question/85564 ? [10:58] hello , i have one question about ppa , how do i know if a ppa is used ? for example https://edge.launchpad.net/~mapopa/+archive/qt4.6 [10:58] i don't know how many people are using it [10:58] mariuz, yeah, that's a pain. [10:58] mariuz, it's a known bug that more than one person is keen to fix. [10:59] mariuz: no - at the moment you can only see that it's being used by the developer (in the PPA statistics section), but download stats are on the agenda :) [11:00] ok thanks [11:00] soyuz folk, who should I punt this question to? https://answers.edge.launchpad.net/launchpad/+question/85631 [11:01] jml: reading it ... [11:01] bigjools, thanks. [11:01] That was discussed in #ubuntu-devel or similar a couple of days ago. [11:01] It's a bug in the package. [11:02] (discussed by the asker of that question) [11:03] * jml answers appropriately. [11:03] Anyway, package bug. [11:03] it is a package bug [11:04] it even says that in the build output [11:04] wgrant, bigjools: thanks. [11:04] jml: I'll answer it [11:04] bigjools, ok thanks. [11:04] now, only one _actual_ question left, which I need translations help for. [11:05] time to prepare a list of admin tasks. [11:07] jml: if you're curious, it's because translations are only stripped in official builders and that's where the package bug is [11:08] bigjools, good to know :) [11:16] danilos, Ursinha: actually, there's another question: https://answers.edge.launchpad.net/rosetta/+question/85512 [11:28] someone wants to have their project deleted and a new project group of the same name created [11:28] I don't know how to actually do that [11:33] jml: AFAIK it's a LOSA task. [11:33] :( [11:33] creating new project groups was always a kiko thing [11:33] mthaddon, I have permission to do that, I think. [11:34] mthaddon, but I don't think I can do it as long as there's a project of the same name that already exists [11:34] jml: you'll probably have to rename the old project first [11:34] Rename, deactivate, create. [11:34] mthaddon, ahh, rename. thanks. [11:36] * jml files https://bugs.edge.launchpad.net/launchpad-registry/+bug/452056 [11:36] Launchpad bug 452056 in launchpad-registry "End users cannot create project groups" [Undecided,New] [11:40] and projects can be renamed via the API? === mpt_ is now known as mpt === doctormo_ is now known as doctormo [12:30] how can i check a location in translations so i could understand the context of a scentence or words? is that possible? === corezion is now known as Guest47638 === apw` is now known as apw [12:56] Is there any way I can get a combined list of bug reports that are either (a) filed against the update-manager project or (b) filed against the update-manager Ubuntu source package? [13:02] mpt, no. [13:02] mpt, at least, not through the web UI. === bigjools is now known as bigjools-lunch [13:09] On the OpenID page it says sourceforge is supported , but it's not. [13:13] Appiah: It is. [13:14] just asked in sf since I cant login and they say it's not [13:14] Appiah: https://sourceforge.net/account/login.php click the OpenID icon and enter your LP OpenID link? [13:14] did [13:14] worked before for me >_> === matsubara-afk is now known as matsubara [13:15] http://sourceforge.net/apps/trac/sourceforge/wiki/OpenID#SupportedProviders [13:19] Appiah, there was an issue with this recently. we've had word that SF has fixed the bug & are waiting to deploy it. [13:19] Appiah, https://bugs.edge.launchpad.net/canonical-identity-provider/+bug/449105 [13:19] Launchpad bug 449105 in launchpad-foundations "logging into sourceforge with openid breaks" [High,Invalid] [13:26] ah === menesis1 is now known as menesis [13:48] is there a way to get a web URL for an API object? [13:52] I've seen people do hacks with self_link [13:52] I'm not sure if web_link was recently added [13:54] james_w, thanks. === mrevell-lunch is now known as mrevell === bigjools-lunch is now known as bigjools [14:09] Hi all. Is there anyone here that could change my lp nick to something that doesn't contain half my email address? [14:10] you can edit it yourself on your profile page, I think [14:10] Oli```: Change your "Name" on https://launchpad.net/people/+me/+edit [14:12] yeawoohoo! thanks jpds [14:32] jml, I think they can, but I've never done that myself [14:32] kiko, web URLs for API objects? [14:37] jml: bug 316694 [14:37] Launchpad bug 316694 in launchpadlib "Add web_link property to resources" [High,Triaged] https://launchpad.net/bugs/316694 [14:37] noodles775, thanks. [14:39] jml, renaming projects via the API -- it does require .Admin though [14:39] kiko, yeah, it requires .Admin [14:39] which sadly I lack. [14:39] I have it, what do you want renamed? [14:40] kiko, Rename tqila to tqla and rename puredyne to puredyne-old [14:41] one sec [14:42] kiko, thanks. [14:43] https://edge.launchpad.net/tqla [14:43] https://edge.launchpad.net/puredyne-orig [14:44] kiko, thanks :) [14:45] jml, if they want puredyne-orig renamed to something else later let me know [14:45] that's one way of avoiding a deactivated project [14:46] kiko, will do. [14:47] jml, I take it puredyn want a PG? [14:47] +e [14:47] kiko, yes [14:47] gtcha [14:47] kiko, https://answers.edge.launchpad.net/launchpad/+question/85377 === rmcbride_ is now known as rmcbride [15:01] danilo_, now that I know you are around, I have some translations questions for you === jblount is now known as jblount-bot [15:01] jml: the ones I already responded to or some new ones? :) === danilo_ is now known as danilos [15:02] maybe some new ones. [15:02] I'll have a look :) === jblount-bot is now known as jblount === Andre_Gondim is now known as Andre_Gondim-afk [16:05] Hi [16:07] launchpad.net/zeitgeist is showing an obsolete version in the Downloads pane at the right of the page. Bug? [16:08] is there a way to view the activity log for a bug? [16:08] Append /+activity to the URL [16:08] and argue vociferously in the bug about how it sucks that it was removed [16:25] maxb: thanks! [17:10] jml, there for some question ? [17:11] sbordet, depends on the question? :) [17:11] I would like to report some bug about karmic, and followed instructions on how to [17:11] I tried to create an account in launchpad [17:11] but says my email is already taken [17:11] try to login, no dice [17:12] try to get a new password, it says that launchpad cannot find my account details [17:12] I am stuck now, jml :) [17:12] you know what should I do ? [17:13] hmm. [17:13] sbordet, I'm not sure. I'll look into it. will be a few minutes, I'm afraid. [17:13] no problem, ping me here [17:13] need details, jml ? e.g. my email ? [17:14] sbordet, I'll let you know. [17:14] I don't think I ever had an account... if it's easier to delete it, just do it, and I'll recreate it [17:15] will do. [17:15] I'm also on a phone call right now [17:15] which basically prevents me doing anything that requires new thinking :) [17:15] sbordet, do you have an ubuntu one account? [17:16] beuno, no, have not used ubuntu one yet [17:16] sbordet, have you requested ubuntu CDs? [17:16] I [17:16] I have an ubuntu forums account [17:16] I'm trying to see if you have an openid account, but not a LP one [17:16] no, have not requested cds [17:16] there used to be a bug around that [17:18] I don't have an openid account that I manage, unless you refer to openid support provided by, e.g., blogger.com [17:19] ok, so it's not that [17:19] what's the email address? [17:20] beuno, simone.bordet@gmail.com [17:21] mthaddon, any LOSA around to check if that email is in the DB? ^ [17:23] sbordet, see if you got new email from Launchpad to reset your password === salgado is now known as salgado-lunch [17:24] beuno, sbordet: I just did the reset password workflow from login.launchpad.net instead of from launchpad.net/+login [17:25] matsubara, got email and reset password [17:25] it directs me to launchpad with openid [17:26] sbordet, are you able to login now? [17:26] matsubara: [17:26] Oops! [17:26] Sorry, something just went wrong in Launchpad. [17:26] We’ve recorded what happened, and we’ll fix it as soon as possible. Apologies for the inconvenience. [17:26] (Error ID: OOPS-1384G2331) [17:26] https://lp-oops.canonical.com/oops.py/?oopsid=1384G2331 [17:27] that's a start, a bad one but a start. :-) [17:28] I need to wait 10 min for that log report to be available. [17:28] sure === dpm is now known as dpm-afk === beuno is now known as beuno-lunch [17:32] sinzui, have you seen an oops like: OOPS-1384G2331 before? [17:32] https://lp-oops.canonical.com/oops.py/?oopsid=1384G2331 [17:34] matsubara: no, but registry does not often look at login issues. This is defintely coming from SSO too [17:34] ok, so where were we. [17:35] sinzui, sorry to bother you then. I guess it's foundations then [17:37] login, and creation stuff is usually foundations, but since this traceback shows account, that may also mean it is ISD who manages SSO [17:37] thanks sinzui [17:41] guys, I got another email asking me to finish my account [17:41] I entered name and again password [17:41] got this error: [17:41] The email address simone.bordet@gmail.com is already registered in the Launchpad Login Service (used by the Ubuntu shop and other OpenID sites). Please use the same email and password to log into Launchpad. [17:43] tried to login as before, but got another oops [17:43] sbordet, what happens if you try to login using: https://login.launchpad.net/ [17:43] ? [17:44] matsubara, I get a message saying that: [17:44] The email address 'simone.bordet@gmail.com' has not yet been confirmed. We sent an email to that address with instructions on how to confirm that it belongs to you. [17:44] and I do not proceed [17:48] sbordet, I think you're hitting bug https://bugs.edge.launchpad.net/launchpad-foundations/+bug/415977 [17:48] Launchpad bug 415977 in launchpad-foundations "Password recovery on account creation is confusing for non-Launchpad users" [High,Triaged] [17:50] sbordet, not sure what's the workaround though since when we tried the reset password using login.launchpad.net you hit an oops [17:51] matsubara, yes :( [17:51] matsubara, can you delete my account entirely ? [17:53] sbordet, I can't. one way of workaround this is to go to launchpad.net, click the login/register button, add your email address like: simone.bordet+lp@gmail.com and then proceed with the new account creation [17:54] this will effectively create a new account on Launchpad that will allow you to file bugs on Ubuntu as you intended initially [17:54] later on you can merge your old account with the newly created account [17:54] matsubara, but should I create that gmail account ? [17:55] the plus and everything behind it leads to the address mentioned before the plus [17:55] sbordet, no need, gmail works that way. if you add a +anything to your account it'll go to your main gmail account [17:55] the plus and the rest are ignored by gmail === dorins_ is now known as dorins [17:59] oh well, every day is good to learn something :) [17:59] I'll try === jon is now known as Guest1592 [18:01] matsubara, that worked === jml changed the topic of #launchpad to: Read https://help.launchpad.net for help | Help contact: - | Join https://launchpad.net/~launchpad-users | This channel is logged: http://irclogs.ubuntu.com/ | Launchpad is open source: see channel #launchpad-dev === matsubara is now known as matsubara-lunch === beuno-lunch is now known as beuno === salgado-lunch is now known as salgado === matsubara-lunch is now known as matsubara === yofel_ is now known as yofel === oubiwann_ is now known as oubiwann === salgado_ is now known as salgado === ursula_ is now known as Ursinha === micahg1 is now known as micahg [21:47] hi, I am abit lost with bzr (beginner). I uploaded a full source code on LP with bzr [21:48] now, I have received another set from somebody else and i would like do merge it with the one on LP [21:48] it is translations actually [21:49] how coudl i do that ? bzr commit sends me "not a branch" [21:49] thanks [21:51] bzr branch MAIN_LOC [21:51] then go into the directory created [21:52] then bzr merge OTHER_LOC [21:55] hum, sorry for not being "clear" : on LP i have a source code translated at 50% [21:55] i juste received the other half of the translated file [21:55] filenales are the same, directory structure too [21:55] thnaks :) [21:55] Remaille: so the thing you received isn't a bzr branch at all, right? [21:56] yes juste a big zip with plenty of python files in it [21:56] Remaille: I guess I'd just check out what's on launchpad, then untar or whatever the files you received on top of that, then "bzr st"/"bzr di" to check for sanity, then commit and push to launchpad [21:56] and "check out" was the wrong word, I meant "get" [21:57] bzr st : not a branch [21:57] :s [21:57] Remaille: that's assuming the zip you got contains no .bzr directory and was based on the same version of the code as what's in launchpad [21:57] Remaille: how did you get what's in launchpad? [21:58] i pushed it as a very first commit a few days ago [21:58] Remaille: the idea is to unzip the files you got on top of your bzr branch of what's in launchpad, while leaving the .bzr directory intact [21:58] one guy translated the menus of the soft, one another translated the tabs [21:58] Remaille: I can't give you exact instructions without knowing the exact branch names and pathnames involved [21:59] https://code.launchpad.net/linuxedu [21:59] Remaille: do you still have the branch you pushed to launchpad? [21:59] the folder are ~/sadms/sadms_marc and ~/sadms/sadms_bruno [21:59] ~/sadms/sadms_bruno has been pushed to LP [22:00] yes [22:00] Remaille: ok. "bzr st" inside ~/sadms/sadms_bruno gives no output, right? [22:00] Remaille: and "bzr st" inside the other sadms gives "not a branch"? [22:00] mzz, right no output [22:00] mzz, yes [22:01] Remaille: then I'd "cp -r ../sadms_marc/* ." from inside sadms_bruno, then run "bzr st", assuming I understand what was modified correctly [22:01] specifically: I'm hoping they didn't both modify the same files [22:02] mzz, they did ! ;-) [22:02] :-s [22:02] it's possible this cp operation replaces a few files with older versions. "bzr st" and "bzr di" should tell you if that happened, and you can then just "bzr revert" to get the newer files back [22:02] ok, bzr can still help, but this'll be a bit more of a hassle [22:02] i thought it would be simple as "bzr merge" [22:02] oh wait [22:03] you only have the one revision of this in bzr, right? [22:03] yes [22:03] err, that makes this more awkward [22:03] gosh [22:04] if the version of the code modified by sadms_marc was in bzr you could branch that revision, commit the changes from sadms_marc on top of that, and then merge the two branches [22:04] hmm, let me see if there's a trick to make bzr still help here [22:05] Remaille: the problem is that without ancestry information bzr can't tell which changes in sadms_marc are desirable and which aren't [22:06] Remaille: if bzr knows about the version both sadms_marc and sadms_bruno are based on it can use that to tell what's what [22:06] I think I'd just do the merge by hand here [22:07] someone else here might have a better idea though. [22:14] thanks a lot mzz I learned a lot on bzr :) [22:14] (need to learn more ! ;-)) [22:15] Remaille: basically you have more information than bzr does (you know about the previous revision, so you can tell which of the differences between _marc and _bruno are actually changes from that original revision to _bruno and which are the actual changes from that original revision to _marc which you want) [22:15] bzr doesn't know about that original revision, so it doesn't know what the changes from that revision to _marc are, only what the differences between _marc and _bruno are [22:16] and that's not enough information to do the merge automatically [22:17] this will obviously get better as you use bzr a bit longer and you start having the version of the code contributors work on in bzr (or even better: contributors start using bzr too) [22:17] oh, also #bzr is a good place to ask about this kind of thing (I actually thought this was #bzr) [22:19] thanks i didn't know about this chan === ursula is now known as Ursinha [22:28] see you :) === salgado is now known as salgado-afk === matsubara is now known as matsubara-afk === oubiwann_ is now known as oubiwann === funkyHat_ is now known as funkyHat