[00:01] How do I apply a diff file to a branch? [00:01] did the diff come from bzr? [00:02] ya [00:02] why the diff then? [00:02] instead of using bzr merge or producing a bundle? [00:03] somebody else generated a few diff files and never pushed a branch to let me do a merge with [00:03] can you ask them to produce a bundle instead? [00:03] if not, just apply with 'patch' [00:04] how do I apply w/ that command? [00:04] I know there's multiple files changes with each patch file [00:05] The person should really generate bundles. With bundles, you'd then use "bzr merge path/to/whatever.bundle" [00:05] I already asked them to [00:05] they won't [00:06] nvm... I figured it out [00:15] bob2: I have pushed from my home computer which was revision 1726, then I pushed from work which was 1727, both show up on launchpad, but when I try bzr up it says at newest revision 1726 [00:18] bob2: maybe I should just try to get the branch again from launchpad? [00:44] jelmer:http://en.wikipedia.org/wiki/AFB_Hoedspruit [01:02] 'evening Bob [01:07] hi jelmer [01:08] Hi lifeless [01:08] How are things? [01:08] as well as can be expected [01:20] bob2: sorry to bother, but I just had another look at it, and I think it's because when I started the other working directory at work I used "bzr branch" then pushed back to the original place rather than "bzr checkout" [01:20] does that sound possible? [01:25] Bazaar (bzr) 1.16dev [01:25] how do i start git-serve now? [01:26] jseabold: checkout and branch do mostly the same thing [01:30] bob2: Hmm, I just tried both and the branch command said "Branched revision(s) 1727" and checkout didn't return any message, so I thought maybe that was the difference. [01:33] jelmer: ^ [01:33] evn, bzr serve --git [01:33] it appears to work [01:33] should it output anything? [01:34] evn, no, not at the moment [01:34] fatal: http://localhost/info/refs not found: did you run git update-server-info on the server? [01:35] is it on some specific port? [01:35] jseabold: sorry, not sure where you ran these things etc [01:36] oh, something happened [01:37] http://pastie.org/492184 [01:37] bob2: Right, oh well. Thanks for the help, but I've got to run. I'm sure I'll be back if I keep running into this problem... [01:40] evn, not sure what's happening there. Any chance you can file a bug? [01:40] I don't have time to look into it now unfortunately [01:40] sure...where [01:40] launchpad.net/bzr-git [01:41] ok [01:41] I don't have time to look into it atm, time for sleep [01:41] g'night [01:41] thanks [01:45] https://bugs.launchpad.net/bzr-git/+bug/381143 [01:45] Ubuntu bug 381143 in bzr-git "bzr serve --git creates an absolute URL with a transport on OS X and then complains about it" [Undecided,New] [01:48] hello there, bot [01:57] ubottu isn't a bot, just a really fast typer. :) [01:57] Error: I am only a bot, please don't think I'm intelligent :) [01:57] ubottu: Not helping! [01:57] Sorry, I don't know anything about Not helping! [01:57] :( [02:05] ubottu: Help [02:05] Hi! I'm #bzr's favorite infobot, you can search my brain yourself at http://ubottu.com/factoids.cgi - Usage info: http://wiki.ubuntu.com/UbuntuBots [02:07] What does it respond to? [02:22] morning [02:25] G'morning! === nadavoid_away is now known as nadavoid [04:33] I've used bzr push sftp://[stuff] and connected and apparantly succeeded. But it didn't do what I thought it would. It crated a repository (.bzr directory) on the sftp server, but it didn't publish an actual files there. What do I need to do to publish the actual files that I'm working with? [04:34] In other words, I currently end up with *only* the .bzr directory being created on the server. [04:34] 'bzr checkout' [04:34] then the 'update after push' plugin [04:35] ( https://launchpad.net/bzr-push-and-update/ ) [04:35] bob2: that looks perfect. thank you very much! [04:36] bob2: should I delete the .bzr directory I just created, before I try what you suggested? [04:49] no [05:51] Having trouble setting ACLs for shared repositories [05:51] Anyone with such knowledge? [06:33] I've done 'bzr push sftp://[stuff]' --- now I can't get 'bzr checkout' to work. I've tried several variations of the command. [06:34] I want 'bzr checkout' to put the actual files on the server. [06:34] 'bzr checkout alone doesn't do it. [06:36] I've also tried 'bzr checkout ./ sftp://username@server/~/path/to/directory' but that gives me this error: "ERROR: File exists: 'path/to/directory/.bzr': Failure: unable to mkdir" [06:37] I tried that exact same command after deleting .bzr directory on the server, but that failed too. (I forget the error message on that one.) [06:39] don't do any of that, aside from the first 'push' [06:39] https://launchpad.net/bzr-push-and-update/ [06:40] oh. so I just install the plugin, then do 'bzr push' again? [06:40] don't know [06:40] nadavoid: you'll need to install the plugin, ssh to the server, run 'bzr checkout .' in the directory in question, and then when you push it should just work [06:41] lifeless: bzr isn't installed on the server. Would that prevent me from doing what you say? [06:41] yes [06:41] bummer. [06:42] nadavoid: if you just want a copy of the code on the server, get the upload plugin instead [06:42] it it designed for web publishing and such [06:43] lifeless: that would work if I'm wanting to regularly make updates? [06:44] I want to have a local copy of php code, and push it out to live sites occasionally. [06:56] nadavoid: thats what bzr-upload is designed for [06:56] ok, great. now I just have to figure out how to get it installed properly. [07:19] anyone aware of any invocation rites to get jelmer here ? [07:20] he should be on soon, he is in spain at a sprint at the moment [07:52] lifeless: ah, i see, im tinkerning with adding some higher level api's to dulwich, want to discuss before starting implementing [08:53] poolie: ping? I [08:54] I'm not sure I understand your response on the ML. following release doc I did 'make dist' and it succeeded. === jblount_ is now known as jblount [09:03] Peng_, ping [09:08] jelmer: are there any plans to make the dulwich apis more nice for walking trees/commit graphs [09:09] currently many things about objects give me object id's, when another objects might have been convient [09:14] BasicOSX: hello [09:14] i'll re-read it [09:14] igc: hello, if you're here [09:14] hello lifeless [09:15] lifeless: is there a "scroll to bottom" key in irssi? [09:16] ronny, Hi [09:16] ronny, I'm not sure what the best approach is there [09:17] ronny, The Bazaar graph utility functions are generic enough that they're usable for git as well, but I'm not sure if I want to maintain a copy of them in Git [09:17] igc, ping [09:18] jelmer: i can probably deal with the graph walking fine, but walking the trees could be a bit more convient [09:18] BasicOSX: answered; hth [09:18] ronny: What sort of functions are you looking for exactly? Walking the contents of the full tree? [09:19] ronny, Just iterating over all entries in a trees works fine for me, there's also a function that can lookup a path [09:20] jelmer: im mostly looking for apis that give me objects instead of object-id's [09:20] ronny: If you have an object id it's a matter of repo[object-id] to get at the object [09:21] jelmer: im not exactly sure on it yet, i'll implement a prototype in anyvc [09:21] ronny: Retrieving the object immediately from tree is going to be slow if you don't actually need the object [09:21] jelmer: yes, but that step of indirection feels inconvient, i have to take care of the repo, the object, the id's , lost of things to track i dont directly care about [09:22] ronny: dulwich can provide a function that returns an iterator over tuples of data in the tree, but you have no ability to skip any data in the tree [09:22] igc: great performance patches [09:23] jelmer: i'll build what i think that could work nice and will let you review that for suckage points [09:23] ronny, would that help? [09:24] jelmer: im not yet sure on my exact neesds, anyvc's history stuff is still rather small [09:32] mwhudson: is the vlc import still failing? [09:33] jelmer: i don't know, let's look [09:33] jelmer: yes: https://code.edge.launchpad.net/~vcs-imports/vlc/master [09:36] Hi, I use bzr 1.15 and want to use something like svn externals. I read all about nested trees and I think that's what I want. But it doesn't work. I always end up with a error message "ERROR: Cannot join myproject. Trees have the same root id". [09:37] I'm developing zope and have a directory "src" where my projects are. They're all their own repositories. Now I want to have a "root" repositry that fetches them all plus some config files for the whole project when I co it. [09:37] Am I misunderstanding the "nested trees"? [09:38] wam: you are aware nested trees are very alpha-ish right? [09:38] wam: but that sounds like the trees you are joining are not in a format that supports such [09:38] mwhudson: should they all be rich-root? [09:39] mwhudson: I didn't know that they're alpha ;) But I really need that feature... [09:39] beuno: Would you like to work on some more user stories? [09:39] wam: oh look! abentley is here [09:39] ;) [09:42] abentley: could you guide me to a working nested tree setup? I already have a directory with several repositories and would like to join them all to a global repository for the whole project. === cody-somerville_ is now known as cody-somerville [09:46] wam: maybe you could use scmproj (google) for now? [09:47] mwhudson: didn't know that. /me looks [09:52] wam: nested-by-reference is not in a usable state. If you want to combine your trees into a single tree, you can use the merge-into plugin. [09:52] abentley: thanks, I'll have a look [09:53] wam: If you want the trees to remain separate, scmproj is probably the best choice. [09:53] abentley: that was the intention. So scmproj will match. [11:11] ping poolie, jelmer [11:11] hi guys - was at dinner previously [11:12] I've got 10-20 minutes before I need to get the kids into bed if you need to chat about anything [11:22] igc: they're in a session I think [11:22] thanks pygi [11:32] * igc bbl [11:43] question: i've made more than a few changes in my own branch, which I now want to merge back to the trunk, but re-shuffle the commits into more logical segments [11:44] so i've tried to generate a diff from the common ancestor between my branch and the trunk, which i then want to apply to the trunk and then proceed like that [11:44] bzr-rebase [11:44] but think about whether it really matters to you or not [11:45] oh i see [11:46] i ran into problems with creation of new directories and moving files, it doesn't seem to be cleanly supported by the diff,patch combo [12:00] poolie: dunno, never looked for it [13:40] LarstiQ, ping [13:42] jelmer: pong [13:43] LarstiQ, are you still able to reproduce bug 336749 with newer versions of bzr/bzr-svn, with fresh clones? [13:43] Launchpad bug 336749 in bzr-svn "reconcile raises a KeyError on a fresh branch" [Undecided,Invalid] https://launchpad.net/bugs/336749 [13:44] jelmer: how new? [13:44] LarstiQ, like, 0.6.1 [13:44] jelmer: should I wipe the cache? [13:44] LarstiQ, yeah [13:44] * LarstiQ reruns the sequnce [13:44] LarstiQ, you also might want to install python-tdb at the same time (should give a faster and smaller cache) [13:44] jelmer: I'm a bit leary of tdb yet [13:45] it's still a very fresh change, see things like bug 381270 [13:45] Launchpad bug 381270 in bzr-svn "Debian packaging doesn't declare minium python-tdb version" [Undecided,New] https://launchpad.net/bugs/381270 [13:46] Ah, I should be using tdb.Tdb probably [13:47] jelmer: I started packaging 0.6.1 as you see, I hope that's ok [13:47] LarstiQ, more than ok :-) Thanks for doing that [13:47] jelmer: feel free to prewarn/prod me on irc around a release so the debs can be done even faster ;) [13:47] LarstiQ, will do :-) [13:48] hmm, the bzr check https:// trips an assertion [13:49] jelmer: bzr branch https://../spitfire; cd spitfire; bzr reconcile -> similar backtrace, same KeyError [13:49] LarstiQ, but what about branch? [13:50] LarstiQ, That's the main one we looked at tbh [13:51] hmm, I can't find the tdb cache to remove [13:52] Should be somewhere in ~/.cache/bazaar/svn if you have xdg [13:52] check [13:52] * LarstiQ removes [13:53] jelmer: the second branch completes [13:53] * LarstiQ tries log [13:53] seems to work too [13:53] LarstiQ, Ok, so reconcile is the main thing that's remaining? [13:54] jelmer: so far, yes === mrevell is now known as mrevell-lunch === Kissaki^0ff is now known as Kissaki [14:39] beuno: could you test the hardy bzr-svn 0.6.1 package in the (main and beta have the same) ppa? [14:43] LarstiQ, will do in ah hour or two [14:43] cool === mrevell-lunch is now known as mrevell [14:53] hi [14:54] I've a repository I want to give access to only a subdir is it possible ' [14:54] ? [14:57] visik7: if with repository you mean branch, no. [14:57] yes sorry a branch [14:57] neither with views ? [14:57] I very much doubt that. [14:57] visik7: you could split it into different branches though. [15:24] LarstiQ: how ? [15:39] lifeless: Ping? [15:40] Hi all [15:41] It's possible to define an alias similar to launchad plugin "lp"? [15:42] * awilkins thinks the answer is in your question [15:43] danigm: such as in another plugin, yes [15:44] GaryvdM: but it's needed to add another plugin? is not possible to do it changing a configuration file? [15:45] No [15:45] You may be interested in the bookmark plugin? [15:45] GaryvdM: ok, I will look it === Noya_ is now known as Noya [16:13] Damnit. So now all my preferences and subscriptions and login and everything on the wiki is gone off to la-la land? [16:16] fullermd, because of the LP signon? [16:16] Yeah. [16:17] I remember I was still subscribed to /a/ page, but I don't remember if I've been getting updates. [16:17] hmm ? [16:17] huh. maybe not though (according to my UserPreferences page) [16:18] hello emmajane [16:18] poolie, hey :) [16:18] they should have had it email everyone a thingy to migrate their preferences to their LP account ... [16:18] fullermd, Yeah, I lied. I have no subscriptions either. [16:19] SamB, I have no recollection of receiving such an email... [16:19] I said "maybe they should have" [16:19] indicating that they didn't [16:19] Better would be to just let me migrate the account... [16:19] SamB, ahhh. I missed the part where you didn't type "maybe" ;) [16:19] oh, oops [16:20] fullermd: that's what I mean -- should have emailed you a link to do just that [16:20] or a blob of text or something [16:20] poolie, did you stick around for UDS? [16:21] SamB, that's *way* too logical to give users choice. :) [16:22] emmajane: what, you would prefer it try to migrate to a launchpad account with the same email and, if none existed, just drop everything ? [16:23] emmacjane, yes, i did [16:23] I mean, you might have used say naesten+bzrwiki@gmail.com or something -- presumably you wouldn't have that listed in your launchpad account ;-) [16:24] SamB, I'm just agreeing with fullermd that it's rude to lose user data/preferences. :) [16:26] poolie, excellent. :) [16:26] now that you've alerted me to this issue, I have resubscribed to http://bazaar-vcs.org/GitStyleBranches [16:27] which is probably the only thing I was subscribed to [16:28] speaking of which, does anyone have any criticisms for that page? [16:30] jelmer: you got some code somewhere that helps viewing svn history as reasonable graph? [16:31] ronny, How do you mean? [16:31] ronny, subversion is mostly left hand side revisions and cherrypicks [16:32] jelmer: i have no idea what you mean by that [16:32] SamB, I don't understand what it's about.... [16:32] ronny: I'm afraid bzr-svn doesn't use svn mergeinfo as well as it could :-( [16:32] ronny, revisions in subversion don't have more than one parent [16:32] SamB, ? [16:32] bascially i just want to try to make the stuff in branches/tags/trunk look as dag-ish as possible [16:33] jelmer: well, you COULD try to check if all of the revisions since a branch point have been merged ... [16:33] SamB, that'll help only a few users at a performance cost [16:34] jelmer: and probably just make them grumpier ;-) [16:34] yes [16:34] SamB, supporting mergeinfo that way is pointless until bzr itself supports proper cherrypicking tracking [16:34] but it sounds like it's what ronny was hoping for [16:34] SamB, no, it's unrelated - we weren't talking about bzr-svn [16:35] well, I mean, ronny seems to be looking for code that does basically that [16:35] SamB, no, because that's unrelated to a dag [16:35] jelmer: I don't see how it's unrelated! [16:35] hmm, svn history is not exactly coercable into a dag [16:36] ronny, afaik you're looking for svn repository layout code right? [16:36] jelmer: mostly [16:36] ronny: yeah, looking at git-svn's graphs in gitk is always so depressing :-( [16:36] jelmer: i wantto have a remotely reasonable log [16:37] ronny, there's nothing like that in subvertpy [16:38] jelmer: i know that already, just wondered if you had something about that somewhere else [16:38] hmm, time to play with remoteaccess [16:38] ronny, bzr-svn does that sort of analysis [16:39] i need to get at least the commit message of the "head" revision [16:39] SamB, I took a look at your wiki page. It needs more of an introduction. I don't understand what it's describing at this point. [16:39] ronny: So, RemoteAccess.get_log will get you linear history information just like "svn log" [16:39] emmajane: yeah. I seem to have thought so too ... but couldn't figure out what to say [16:40] at least, judging by the thing I have in brackets at the top [16:40] SamB, adding a useful heading to the very-very top would be a good start. :) [16:40] SamB, try just telling me here what it's about and then cheat and copy and paste it into the doc. [16:41] jelmer: are there any examples to get the last revision that commited to trunk? [16:41] well, it's supposed to be about how to keep several branches around but use them all with the same working directory [16:41] SamB, cool! [16:41] ronny, see examples/ra_log.py [16:41] sort of like when you use branches with git [16:42] SamB, how about: Creating a working directory [16:43] and then: This page explains how to set up a working directory that contains multiple branches. This will be familiar to those who've used Git in the past and are migrating to Bazaar. [16:43] emmajane: well, it can't actually *contain* the branches [16:44] at least, I don't know how it can [16:44] (although who've to should be expanded as it's harder for ESL readers) [16:44] jelmer: doesnt looke exactly what i want, im goign to try figuring [16:44] jelmer: in case of doubt, i have to take the latest from_rev inside the first callback and run a second one? [16:45] ronny, that's exactly what you were mentioning except that it iterates all revisions from 0 to the latest rather than the other way around [16:45] and you need to pass limit=1 if you need just one [16:45] SamB, no? [16:45] SamB, I thought that was the whole point: shared repo for multiple branches? [16:46] emmajane: yeah [16:46] but unlike git, the branches aren't inside the working directory [16:46] not without ColocatedBranches, anyway [16:46] SamB, great, so go ahead and adjust what I've typed to make it right for your doc. [16:48] emmajane: okay, I didn't change much [16:48] except I basically rewrote the heading [16:49] great. [16:49] SamB, It would also be most excellent to get rid of the (instructions in brackets). They're sort of confusing as written. [16:49] Are you talking about the GitStyleBranches spec? That should probably be folded into the ColocatedBranches one [16:49] specifically: [Again, the cd commands are kinda ridiculous here -- maybe I should use another way of indicating where each step is to be done?] [16:50] jelmer, http://bazaar-vcs.org/GitStyleBranches [16:50] that's the page I'm looking at. [16:50] jelmer: it's not a spec! [16:50] it's a tutorial thingy [16:50] ah, sorry [16:50] never mind me then [16:50] jelmer, :) [16:50] jelmer, I always mind you! :) [16:50] I like to live only very slightly in the future ;-) [16:51] SamB, I often live in the past. :) [16:51] (which is to say, in bzr.dev rather than the release) [16:51] and sometimes I don't upgrade and end up in the past [16:52] SamB, what does the heading, "What They Said" mean? [16:52] SamB, do you mean, "Background information" ? [16:52] emmajane: hmm, yeah, that was the next thing I wanted to change === thekorn_ is now known as thekorn [16:53] hmm, yeah, that sounds like a much better heading there [17:01] SamB, for the actual step by step instructions I like to have detailed information on what I'm about to do and then what I type at the command line. [17:01] jelmer: btw, ever experimented if greenlets turn may turn the svn log into a generator? [17:02] ronny: it seems a bit heavyweight to depend on greenlets for that sort of thing, it would mean subvertpy would have to depend on them [17:02] jelmer: im trying to figure hout how to wrap it, so it will fallback to a thread [17:03] SamB, and where possible I like to expand commands (e.g. the shortcut on mv. Not everyone knows about curly braces...I've been using *nix for over six years and just found out about it last year.) [17:03] ronny: bzr-svn also has some functionality that can do that, using a simple helper thread [17:04] SamB, You can probably also get rid of the cd $FOO and cd .. commands. Just explain to people in words which directory they need to be in before issuing the relevant command. [17:08] I've made it in life! lifeless asked me to be his facebook friend. :) [17:43] night all [18:17] Hello, is it possible to make bzr ignore symlinks? === Guest is now known as Guest2022 [18:18] I mean, how do I create a general rule into .bzrignore to make it ignore all symlinks [18:41] no one? [18:42] I'm pretty sure there isn't one. .bzrignore just takes paths. [18:45] thanks [19:07] Anyone with knowledge of ACLs? === awilcox_ is now known as awilcox [20:08] Can anyone assist with a permission issue? === abentley1 is now known as abentley === nevans1 is now known as nevans === mtaylor_ is now known as mtaylor [21:19] awilkins: pong [21:50] What is the best way to set up a shared repository among several users on a single machine? === Kissaki is now known as Kissaki^0ff [22:59] Created a standalone tree (format: pack-0.92) <--- that's a nice touch. [22:59] takes some of the magic out of init. [23:09] beuno: pong, ish === nevans1 is now known as nevans === AnMaster is now known as AnMaster_ === AnMaster_ is now known as AnMaster