[08:47] <mgz> morning
[08:49] <jelmer> hey
[09:08] <smspillaz> jelmer: around ?
[09:17] <jelmer> smspillaz: hi
[09:18] <smspillaz> jelmer: hey :)
[09:18] <jelmer> smspillaz: what's up?
[09:19] <smspillaz> jelmer: so I was looking at getting bzr join working for git imported branches, although it seems to fail when adding the new items to the inventory, since git imports set the file_id of the entry in the inventory to the name of the file (which can clash with items in the new inventory easily)
[09:19] <smspillaz> so I was wondering - is it safe to modify bzr-join to modify the file_ids of imported entries to be, eg, prefixed with the branch we're joining ?
[09:20] <smspillaz> (sorry if that sentence was a bit long, been poking around in pdb a bit)
[09:22] <smspillaz> here's an example in case you need one: http://paste.ubuntu.com/988614/
[09:23] <jelmer> smspillaz: it should be safe to do that, but it will mostly defeat the point of using bzr join at all
[09:23] <smspillaz> jelmer: hmmm, how so ? the history would be kept right ?
[09:23] <jelmer> smspillaz: the revision history will be kept, but the files will appear to have been removed and readded
[09:23] <smspillaz> ah, that's a problem
[09:24] <smspillaz> jelmer: do you think there might be any other way around the name conflicts in the inventory then ?
[09:24] <jelmer> smspillaz: I guess you could use something else for importing from git (fastimport?)
[09:24] <jelmer> smspillaz: which will generate non-deterministic file ids
[09:26] <smspillaz> jelmer: right, although I'm already imported from git
[09:28] <jelmer> smspillaz: yeah, you would have to reimport in that case
[09:29] <smspillaz> jelmer: so I guess the next question is, is it possible to export to git while keeping the history (not flattened ideally) ;-)
[09:30] <jelmer> smspillaz: using fastexport/fastimport? I'm not sure how well that works, to be honest.
[09:31] <smspillaz> mmm
[09:31] <smspillaz> ok, I'll give a couple of things a try then
[09:31] <smspillaz> thanks :)
[09:31] <jelmer> smspillaz: it might be useful to have a look at git-bzr-ng
[09:31] <jelmer> IIRC it allows that sort of thing (but from the git UI)
[09:31] <smspillaz> mm
[09:31] <jelmer> and it uses fastimport/fastexport internally
[12:54] <mgz> jelmer: do you recall what in 2.5.0 conflicted with launchpad when you tried to update it in their codebase?
[12:55] <jelmer> mgz: well, launchpad has to be updated to avoid the methods deprecated in bzr 2.5
[12:55] <jelmer> mgz: doing that broke a bunch of things
[12:57] <mgz> for parallel testing reliability, they could do with the fix for bug 396819
[12:58] <mgz> which is in 2.5.0 but not current launchpad bzr-2.5.0dev2_r6152
[12:58] <mgz> see bug 998040
[12:59] <mgz> maybe some of our maintenance time would be well spent working through the things preventing that upgrade?
[13:00] <jelmer> mgz: I guess it would be better to just cherrypick that fix?
[13:02] <mgz> perhaps? I don't think I have a good sense of the comparative amount of work involved.
[13:03] <mgz> using an actual release rather than a random dev revision seems like a good thing to do regardless,
[13:03] <mgz> but if it's really disruptive maybe not.
[14:35] <cjohnston> jelmer: I was told to paste you this http://paste.ubuntu.com/988992/  to see if you had any idea why its throwing an error..
[14:42] <jelmer> cjohnston: hi
[14:42] <jelmer> cjohnston: at a quick glance it seems like python-dev isn't installed
[14:47]  * jelmer EODs
[14:48] <cjohnston> that seems to be it.. thanks jelmer
[15:57] <ovnicraft> hello i am working in a team so we get a centralized server, but i want to configure to push from team needs an approve, when the push don't auto commit changes
[16:02] <ovnicraft> so i need to implement a workflow with gatekeeper
[16:02] <ovnicraft> but is not clear for me
[16:02] <ovnicraft> how to user make a request to merge
[16:03] <mgz> that's really a social question
[16:04] <mgz> asking and giving a reference to the branch is the basic requirement
[16:05] <mgz> if the gatekeeper is a person, yelling across the office would work
[16:05] <mgz> for a script, you generally want to send email, or something along those lines
[16:05] <mgz> click a button on a webpage, whatever
[16:06] <mgz> there are various existing tools like pqm and tarmac that do this and much more with launchpad
[16:08] <ovnicraft> mgz: so pqm work with bze send ?
[16:09] <ovnicraft> and yes gatekeeper is a person
[16:17] <mgz> if the gatekeeper is going to be a person, just tell everyone to put branches they want merged (with or post review) somewhere he can access them
[16:26] <ovnicraft> with or post review ?
[16:26] <ovnicraft> mgz can you help me  explaining it  or give a doc link ?
[16:36] <wgz> ovnicraft: http://doc.bazaar.canonical.com/beta/en/user-guide/using_gatekeepers.html
[16:38] <ovnicraft> well i understand how it works but i don't get it how implement it
[16:38] <mgz> what's to implement with a human?
[16:39] <ovnicraft> so gatekeeper will make merges from users branches ? or users can try to merge ? and gatekeeper is notified to reviewed
[16:58] <vila> ovnicraft: the gatekeeper does the merges (on his side of the gate), submitters publish their branches wherever they want as long as the gatekeeper can read them (on the other side of the gate)
[16:59] <ovnicraft> ok and users can use bzr send to notify the gatekeeper a patch
[23:19] <ovnicraft> hello i am working with pqm but i can't installed so it can't find pqm python library, i branch code from LP and ./autogen.sh;make; sudo make install
[23:20] <rbasak> How do I see a branch as it was in a previous revision? I want to see a tree that looks like revision 51. In git, I'd do "git checkout 51". What's the bzr equivalent? "bzr switch -r51" crashes on me.
[23:24] <jelmer> rbasak: bzr revert -r51
[23:24] <jelmer> rbasak: or perhaps 'bzr up -r51' (which updates the branch too)
[23:25] <rbasak> jelmer: both of those commands crash too :-(
[23:30] <ovnicraft> there is any way to implement my own pqm manager
[23:30] <ovnicraft> i need to use merge proposal workflow (gatekeeper) and but lp-send works with LP
[23:31] <ovnicraft> and code review app
[23:39] <jelmer> rbasak: how do they crash?
[23:39] <jelmer> ovnicraft: perhaps tarmac?
[23:39] <ovnicraft> really pqm doc is poor
[23:39] <ovnicraft> in fact there is no exists
[23:40] <jelmer> ovnicraft: pqm is pretty hard to set up
[23:41] <ovnicraft> yes miy friend
[23:41] <ovnicraft> have you experience with tarmac to read your feed back ?
[23:41] <jelmer> I have experience with both pqm and tarmac
[23:42] <jelmer> tarmac is a lot easier to set up; I'd recommend it if you're using launchpad
[23:45] <ovnicraft> well i am working in my own server
[23:46] <ovnicraft> i want to implement my own server with merge proposal workflow
[23:50] <ovnicraft> with bzr send, iget this errror
[23:50] <ovnicraft> bzr: ERROR: Public branch "sftp://USER@192.168.1.119/home/gnuthinkserver/proyectos/nomina_61/addons/" lacks revision "ovnicraft@gmail.com-20120515180023-rgtcfe3a2fcibyq8".
[23:50] <ovnicraft> i can't understand the problem?
[23:50] <jelmer> ovnicraft: bzr send won't work with tarmac - tarmac picks up merge proposals from launchpad only, not from bzr send
[23:51] <jelmer> sorry, I can't help right now - about to get some sleep
[23:51] <ovnicraft> yes i know i just working with bzr send
[23:51] <ovnicraft> ok thanks