[00:10] I'm getting this when trying to upgrade to the newest loggerhead: bzr: ERROR: KnitPackRepository('file:///home/mkanat/loggerhead/.bzr/repository/') [00:10] is not compatible with [00:10] KnitPackRepository('http://bazaar.launchpad.net/%7Eloggerhead-team/loggerhead/trunk-rich/.bzr/repository/') [00:13] I had to upgrade my local repo to a rich-root-pack. The error message was pretty unclear. Thankfully the URL was helpful! :-) [00:18] Okay, so I figured all that out on my own. :-) [00:18] Later, folks! [01:51] morning [03:01] * igc lunch [03:35] Is anyone still working on bzr GTK? === KX_ is now known as KX === mtaylor_ is now known as mtaylor [09:24] hi, a question, i have two bzr repositories (created from two svn repositories) one is a fork of the other, so i know at which point it was forked from the other project, i want to merge them to get the common history. is that possible how would it do that, trying bzr merge -r 0..HEAD it will move all directories in the repository root and add new once [09:32] hello. [09:32] what do I do about this? [09:32] bzr: ERROR: bzrlib.errors.TooManyConcurrentRequests: The medium '' has reached its concurrent request limit. Be sure to finish_writing and finish_reading on the currently open request. [09:36] j^: The two svn repositories have different UUIDs, right? If so, bzr's revision IDs will be different even for revisions that are identical (i.e. from before the fork), making merging difficult at best. [09:37] rowinggolfer: That error message is really useless -- it could be caused by anything, like a segfault. You'll need to provide more details. What details exactly I'm not sure. [09:38] You might have more luck managing such a merge within git, which I understand use a revision's content to establish that revision's identity. [09:39] hmeland, yes two svn servers, but in the end i want history of repository1 + repository2 i know at which point they are the same, i can also just take repository1 up to the revision they are the same and add repository2 if thats possible [09:40] j^ I'd use bzr-svn to get r1 imported, then tailor to finish the job [09:41] j^: I guess you could rebase the post-fork revisions from repo 1 onto the fork-point revision from repo 2 (or vice versa), but the file-ids in the two branches are likely different. [09:43] ...unless bzr-svn has some nifty option to derive file-ids from another tree, like "bzr add --file-ids-from"? [09:44] Peng - my network went down during the commit. [09:44] hang on... I'll pastebin the entire thing [09:45] http://pastebin.ubuntu.com/183497/ [09:46] Peng_ you'll note I tried to unlock and check stuff also. [10:01] so any ideas? [10:02] bzr check of both the local and remote branches are error free. [10:02] but bzr push gives me [10:02] Using saved location: bzr+ssh://rowinggolfer@bazaar.launchpad.net/~rowinggolfer/rowinggolfer/trunk/ [10:02] bzr: ERROR: Permission denied: "/~rowinggolfer/rowinggolfer/trunk" [10:02] is that a lock issue? [10:02] or a problem with the launchpad server? [10:06] I'd guess the latter. [10:06] You could of course try "bzr break-lock". [10:07] I have done that. [10:07] A bad lock shouldn't result in permission errors. :\ [10:07] rowinggolfer: "bzr break-lock bzr+ssh://rowinggolfer@bazaar.launchpad.net/~rowinggolfer/rowinggolfer/trunk/"? [10:07] rowinggolfer: No projected called "rowinggolfer" exists. That's probably the source of your error. [10:08] Err, project* [10:08] hmmm. [10:08] 98 previous commits with the same credentials. [10:09] rowinggolfer: FWIW, there's a decent chance that your original TooManyConcurrentRequests error has been fixed in a newer version. [10:09] rowinggolfer: 98 commits to a project called "rowinggolfer"? [10:09] the project is called openmolar [10:10] I am confused also. [10:11] ah, you're looking at line 85... I tried that given the odd url coming back at me [10:12] for some reason... the save location is wrong. [10:12] how the hell has that happened? [10:29] problem solved. [11:09] msg nickserv identify 8596jrv [11:09] crap [11:09] You should type it in a non-channel tab, just to be safe. [11:10] jelmer: lol [11:10] * jelmer sighs [11:10] time to change my nickserv password... [11:10] I commend you for your non-horrible password, though. [11:10] Unlike mine.. === jrydberg is now known as jrydberg|away === jrydberg|away is now known as jrydberg === mrevell is now known as mrevell-lunch === abentley1 is now known as abentley [13:34] beuno: hi [13:34] me and jelmer had some talk about loggerhead serving branches [13:34] and we have two feature suggestions: [13:34] smartserver integration and per-branch authorization functionality === mrevell-lunch is now known as mrevell === _SamB_ is now known as SamB [16:30] what is "bzr pony"? [16:31] bialix: hello [16:31] hi poolie [16:31] it's a silly expression for "I want everything" -- http://www.google.es/search?q="want+a+pony" [16:31] i can trim it [16:32] gotgenes: yes [16:32] oh hmm, was scrolled up [16:33] poolie: I'm still can got it re bzr [16:33] can't [16:33] Wait, my copy of bzr.dev doesn't have a pony :( [16:33] I missed ponies?! [16:35] it seems so [16:36] it just means "i want every feature" [16:36] it's not a very helpful statement, just something andrew? said here [16:37] thanks for reading them though! [16:37] it's pretty rough [16:37] I want Bazaar to churn butter like git does! [16:37] I want it all, I want it now? Queen [16:37] git churns butter? That explains the smell... [16:38] Oddly enough, it can only churn butter on Windows. [16:38] On *nix, it just gets all dried out and creepy. [16:39] pollie_: perhaps I'm very curious person [16:41] :) === poolie_ is now known as poolie [16:42] poolie: is there some announce of upcoming public release of lp? [16:45] I mean some semi-official article? === awilcox_ is now known as awilcox [16:49] address book is interesting idea [16:53] pollie,jam: thx for talking with Gary about QBzr. His new idea is really fresh move. [17:03] bialix: where did you encounter that pony? [17:04] * LarstiQ briefly checked mail, planet and identi.ca [17:04] http://doc.bazaar-vcs.org/devnotes/wishlist.html [17:05] i wanna pony as well [17:06] ah [17:06] thanks [17:20] lifeless: Ping? === Kissaki^0ff is now known as Kissaki === BasicPRO is now known as BasicOSX [22:13] awilkins: pong [22:50] Would bzr-gtk be updated in the bzr ppa sometime? It's not working with the current version in it for a pair of days [23:10] are the docs for bzrlib linked to from the site the most up to date or is there a more up to date set that aren't quite as patchy in the bzr repo? [23:30] -> au [23:37] lifeless: you're one of the bzr devs right? [23:41] Pilky: Yes. [23:41] Unless you're a troll, in which case lifeless who? :D [23:41] lol [23:41] I'm trying to figure out how the hell committing works in bzrlib [23:42] I mean, I understand how to commit from the integrating with bzr document [23:42] You could follow cmd_commit from bzrlib/builtins.py [23:43] but the commit method on mutabletree isn't documented and it looks like the arguments are got from the commit class [23:44] Peng_: it's not as much finding out how as finding out what arguments committing takes [23:45] Sorry, I don't know anything. [23:45] i.e. This isn't documented: http://starship.python.net/crew/mwh/bzrlibapi/bzrlib.mutabletree.MutableTree.html#commit [23:45] this is: http://starship.python.net/crew/mwh/bzrlibapi/bzrlib.commit.Commit.html#commit [23:45] but it seems when committing the former is used === Kissaki is now known as Kissaki^0ff