[00:00] awmcclain: you mean the packaged version? [00:00] awmcclain: you could also try your /var/cache/apt [00:00] james_w: i went from 1.0 to 1.2 [00:01] ah, that wont work then. [00:01] james_w: I figured out some of the problem... seems like bzr-trac balks when used with a shared repo without working trees [00:02] awmcclain: ah, well caught. [00:05] ooh.. yesh [00:05] I'm getting bzr: ERROR: Repository KnitPackRepository('file:///shrepo/.bzr/repository/') is not compatible with repository SvnRepository('svn://localhost') [00:05] when i try to branch an svn directory into a shared repo with trees [00:06] awmcclain: bzr-svn needs rick-root-packs format. [00:06] fullermd: Not sure I really understand. Is that an option i need to specify in bzr init-repo? [00:06] Yah. [00:06] --format=rich-root-packs [00:07] Or maybe it's pack singular. I'd have to check the help... [00:07] For bzr-svn? [00:07] or bzr init-repo [00:07] For the init-repo [00:07] Is there a better (more native) way to convert from svn to bzr? I'm doing a one-way port [00:07] There are one or two other converters around, but I think bzr-svn is the canonical one. [00:08] I think the only other way that's gotten any work lately is whatever that thing is that igc's working on, and that's probably not near as production-ready. [00:08] Won't specifying a different file format hurt performance? [00:08] Hurt performance relative to it not working at all? ;) [00:09] Once i get the repo into bzr, can i convert from rick-root-packs to knit? [00:09] No (you wouldn't want to go knit anyway; you'd want to go pack; but rich roots are a trapdoor) [00:10] Is there wiki page somewhere about all this? [00:10] There's probably something in the bzr-svn docs about it, but I've never look at 'em. [00:11] So, bottom line is, if i'm converting a repo from svn, i'm stuck with an older file format. [00:11] It's not older. [00:11] In a sense, it's newer. [00:12] oh wait, i'm so confused. [00:13] The state-of-the-art is using packs, right? [00:13] Correct. [00:13] rich-root-pack is a variant of pack-0.92 that supports rich roots (much like rich-root is a variant of knits that supports rich roots) [00:13] But using bzr init-repo doesn't default to that? And bzr-svn is expeciting it. [00:14] Ah. [00:14] rich-root-pack is a superset of pack? [00:14] Yah. [00:14] Ahhhh. [00:14] Is there a performance difference? [00:15] Well, I would assume there has to be one, since it does more. But that diff is almost certainly unmeasurable. [00:15] That's the magic word! [00:16] It may miss some optimizations that exist in the straight format; I'm not sure how much of the code is shared. [00:16] But I don't think it would be a large difference, if it's a meaningful one at all. [00:44] Thought I would try out bzr on macosx, on 1st attempt to use it with the whoami command I get Unable to load plugin 'qbzr' [00:44] :) [00:45] hmm..so.. do you guys talk about the bzrarchives proposal thingy here? [00:46] tgunr, so you installed the qbzr plugin and it's failing for some reason [00:46] you should remove it [00:46] and try again [00:47] Verterok, ^ :p [00:47] just delete that folder? [00:47] or plist or something? [00:48] tgunr: the 10.4 installer? [00:48] 10.5 [00:48] beuno: thanks :) [00:49] tgunr: I don't have 10.5, but in 10.4 it's installed inside python site-packages [00:50] CC [00:51] In a shared repository (with trees), is there anything different between mkdir foo; bzr add foo; bzr commit and bzr branch bar (where bar is an empty directory)? [00:51] tgunr: I think it should be in: /System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages [00:51] * fullermd blinks. [00:51] awmcclain: Either you're confused, or you confused me :) [00:52] fullermd: I think both. :) [00:52] fullermd: Basically, is adding a directory using bzr the same as branching? [00:53] fullermd: I ask because I need to fiddle with my directory structure in my shared repository [00:54] You can't "add a directory" in a repository. [00:54] The concept has no meaning in bzr terms. [00:54] Using bzr add? [00:54] Maybe you're thinking svnish? [00:54] Maybe i'm garbling the advice that lifeless gave me yesterday [00:54] (Or maybe you mean 'branch' when you're saying 'repository', but branch'ing inside a branch doesn't make sense either) [00:54] I creating my shared respository [00:55] Well, there is that whole "nested branch layout" under http://bazaar-vcs.org/SharedRepositoryLayouts. ;) [00:56] I want my repo to look like: repo/trunk/src repo/bobby/featureX/src repo/sally/featureY/src [00:57] "repo" in the sense of "shared repository" [00:57] The problem is that in my current SVN tree, I only have /src [00:57] So. [00:58] I think you're mixing too many things around... [00:58] ?? [00:58] For one thing, 'add' is a command that deals with a working tree. A working tree is only related to a branch; it doesn't have anything to do with repositories. [00:59] It may be simpler to forget wholesale about the shared repo, at least mentally, for starters. [00:59] The existence (or non-) of the repo doesn't change anything, relative to just having standalone branches. It just saves space/time. [00:59] Ok. [01:00] So. [01:00] I should do bzr branch svn://src [01:00] which will give me a /src branch + working directory, correct? [01:00] I need to change my tree to look like /trunk/src [01:01] since ppl are talking again: any word on bzr-git? [01:01] robey: just that bzr-svn is broken for 1.2 too. [01:01] * robey howls with pain [01:01] robey: I believe somebody (lifeless?) looked at it recently, but I'm not aware of any real movement. [01:02] (where 'recently' is the past month or three) [01:02] i tried various branches from the launchpad project page for bzr-git, and they all failed in exactly the same way [01:03] it sucks cuz i really dont want to use git, but some stuff here is stored in git repos [01:03] I don't think bzr-git is sufficiently present at its best to be useful for doing real work. So it being broken doesn't necessarily lose you much :) [01:03] fullermd: I'm just trying to set up my mainline server so that we can share feature branches, and I want to do it in such a way that encourages branching. [01:05] I guess another question would be: How would you change the root directory of a branch? [01:06] You mean the "move everything from / into /foo" thing? [01:06] if it was good enough to make a bzr branch from a git one, that would've probably been enough [01:06] I don't think it was ever that good. [01:07] oh well, ok... thanks [01:08] if i have a branch /foo, i want to "reroot" it at /bar/foo [01:09] awmcclain: Theoretically, with rich roots, one could pivot the root dir. But there's no UI or other support for doing so. So the real choice is pretty much as above; make a dir, and bzr mv everything into it. [01:09] fullermd: Exactly what I want to do. [01:09] See, that phrasing is unclear, which makes it tough to answer. [01:09] My use of "reroot" [01:09] ? [01:09] It could be read as "move the branch from /foo to /bar/foo", or it could be read as "move the contents of the branch which is located at /foo into the bar/ subdirectory inside the branch" [01:10] Ah. Sorry. #1 [01:10] (or alternately phrased; you could be talking about moving the _branch_, or you could be talking about moving stuff around _in the branch_. [01:10] If you want to move the branch, you just mv it. [01:11] hrm [01:11] because it's a directory? [01:11] Or tar, or zip, or whatever other random mechanism you use for moving filesystem trees around. [01:11] ah [01:11] but [01:11] Yah. If it's a standalone branch, everything it needs is inside itself, so you can throw it around however you like. [01:11] (if it's in a shared repo, a little more care is needed, since it doesn't have the repo included, but that's another matter) [01:11] Well, it's a branch inside a shared repo. [01:11] =) [01:11] but [01:12] ideally, i want to be able to say [01:12] If it's in a shared repo, as long as it stays under the repo, mv is still what you want. [01:12] ok [01:12] so [01:12] i could do [01:13] bzr-init --trees repo; mkdir repo/trunk; bzr branch SOURCE_URL repo/trunk/src [01:13] and then from the client, bzr branch repo/trunk? [01:13] No. [01:13] OK. That's what I want to do. [01:13] You can only branch a branch, which in this case would be "repo/trunk/src". "repo/trunk" is nothing. [01:14] (also, "bzr init-repo", not "bzr-init", but that's details) [01:14] (Sloppy typing sorry) [01:14] 'src' is a bad name for a branch. You probably want 'repo/trunk' to be the branch. [01:14] Exactly! [01:14] that's the problem [01:14] Either that, or you want to have 'src' be a directory inside the branch. [01:14] (possibly the only thing in the root of the branch) [01:15] The problem is that right now, i have many project in my svn /trunk directory [01:15] so, in order for me to split things up [01:15] i can only do bzr branch svn://.../trunk/sub_proj [01:16] Mmm. Let's assume proj1, proj2, and proj3. [01:17] But, in bzr, i want to make /trunk/sub_proj the branch [01:17] And we'll ignore the presence (or absence) of a share repo for the moment. [01:17] well (/trunk) [01:17] ok [01:17] great [01:17] You can arrange stuff two ways (an infinite number, of course, but 2 main ones) [01:17] One is [01:17] /proj1/trunk, /proj2/trunk, /proj3/trunk [01:17] The other is /trunk/proj1, /trunk/proj2, /trunk/proj3 [01:18] So, I want to have my bzr projects set up like choice A [01:18] But my SVN is set up like choice B [01:18] In the former, other branches of each project would be under /projX, in the latter you'd have either /branchs/RANDOM, or /branches/proj1/RANDOM, /branched/proj2/RANDOM, etc. [01:18] OK, that's no problem at all, since branches are independent. [01:18] You'll bzr branch svn://... once for each project, and you'll end up with N bzr branches, one for each project. [01:19] Then you can arrange them however you like. [01:19] In svn, you're kinda stuck with them laid out however you did them initially. [01:19] With bzr, you can rearrange at will, because there's nothing quite like a svn repo; there's no higher level thing they're all explicitly pieces of. [01:20] SVN looks like this: /pandasite/trunk/panda /pandasite/trunk/artwork pandasite/trunk/notify [01:20] I want bzr to look like: [01:23] ... [01:24] /pandasite/trunk/panda [01:25] /artwork/trunk [01:25] notify/trunk [01:25] */notify/trunk [01:25] Was that first meant to be /panda/trunk? [01:25] So, unfortunately, I can't branch the /pandasite/trunk into bzr, because that will give me two other projects [01:25] no [01:26] We could call it /pandasite/trunk/src /pandasite/trunk/artwork [01:27] I have some "nested" directories in SVN that I want to fix when I move to bzr [01:27] OK, well, let's forget about that, because it twists my brain into probably somewhat irrelevant side paths, and stick with the other two :) [01:27] That's the tricky one, though. :) [01:27] Im done witht eh other two [01:27] :) [01:27] Well, crud. [01:28] Just say you're given a branch that is /src [01:28] And you need to convert to a branch that is /trunk with a subdirectory /src [01:29] I think you're confusing me because you're mixing up the branch, and what's in the branch, which doesn't happen in bzr. [01:29] The branch is /src. It could as well be /, or /foo/bar/mybranch, or whatever? [01:31] So what you really want to do is "move the files/dirs in the root of the branch into a subdir". I keep feeling like you mean more than that, because the solution to that seems so simple. [01:31] Yes! [01:31] That's what I want to do! [01:32] Well, you want to make a dir in the branch, and move everything into it. You do that by making a dir in the branch (technically, your working copy of the branch), and moving everything into it :) [01:33] using bzr mv [01:33] Right. [01:33] do i need to bzr add the dir? [01:33] first? [01:33] I don't think you can actually 'bzr mv *' like you can with straight 'mv', since I dunno if it'll notice you trying to move a dir into itself and DTRT, but... [01:33] Yah. [01:33] i was confused because I was equating "the directory at the root of the tree" with the definiation of the branch [01:34] Does that make sense? [01:34] Ah. Yeah, that could be a source of confusion. [01:34] pehw [01:34] There's a sharp line between "working on your project" (in which you essentially chroot into the root of the branch), and manipulating the branch from the outside. [01:34] right [01:34] (in which case the branch is opaque) [01:35] and "working on your project" == "working within your working-tree" [01:35] cd $BRANCH ; mkdir src ; bzr mv [A-Za-rt-z]* src ; {manually bzr mv s* files or dotfiles} ; bzr ci -m 'Move a bunch of crap' [01:35] Right; your day to day "getting stuff done" [01:36] Ah ha! [01:36] (whoops, I missed the 'bzr add src' before the mv) [01:37] * fullermd pours more coffee. [01:37] Ok. Would another approach be to create a new branch (call it trunk) [01:37] then somehow move the contents of $BRANCH2 into $TRUNK? [01:37] (without creating nested branches) [01:38] Well, you could 'bzr branch src trunk' and do the work in trunk/ instead of src/ if you like. No real reason to, though. [01:38] Or just 'mv src trunk' (not 'bzr mv', since you're not working in a bzr tree). [01:38] but mv src trunk would create nested branches, right? [01:38] you have branch trunk [01:39] then branch src inside trunk [01:39] I meant with 'trunk' not existing; just renaming the directory. [01:39] Branches aren't "called something"; they're just "located somewhere", so changing the "name" is just mv'ing the branch. [01:40] right [01:41] So it wouldn't make senses to somehow move the working tree from branch src into a src directory in branch trunk [01:41] $SRC/* ---> $TRUNK/src [01:42] Not really. Either way you have to move $BRANCH/* into $BRANCH/src/*. It's just a question of whether you 'rename' the branch before or after, which affects nothing. [01:43] Oh, just to be clear, I'm talking about moving working trees from two _separate_ branches, but I'm guessing you can't do that [01:44] Well, you can merge the trees, then mv all the new files before commit. [01:45] ok, let me just dive into this [01:45] If I do all this branch work outside my shared repository, can I just push my branch into my shared repo? [01:46] Sure. [01:46] Can I just cp it in? [01:46] Well, yes and no. [01:46] You *can*. But it'll still be a standalone branch, just one located inside a repo. [01:46] no, because it defaultst he purpsoe of the shared repo [01:46] defeats [01:46] :) [01:46] ok [01:46] You should consider too at what level you want the repo; whether all this goes in one, or you want one for each project. [01:47] right [01:47] Right :) [01:47] it's going to be [01:47] /repo (plain directory with a misleading name) [01:47] /artwork (branch) [01:47] /pandasite (shared repo) [01:48] /pandasite/trunk (branch) [01:48] /pandasite/andrew (dev branch) [01:48] etc [01:48] eeep [01:48] everything from /artwork down lives in /repo [01:48] * fullermd nods. [01:48] (/repo/artwork/) etc [01:48] ok [01:49] Don't need to handle multiple branches of artwork? [01:49] Nope [01:49] What about notify? Where does that fit? [01:52] /repo/notify (shared repo) [01:52] /repo/notify/trunk [01:52] So, the same thing needs to happen for that [01:53] oh, no [01:53] i'll just do [01:54] cd repo; bzr init-repo --trees --rich-root-pack notify; cd notify; bzr branch svn://pandasite/trunk/notify trunk [01:55] btw, thank you for taking the time to walk through this with me. As I've said before, the community and the docs are why I'm switching my team to bzr rather than hg. [01:56] Sounds like something remarkably like a plan to me. [01:59] Ok, last thing... in order to push into the shared repo, I'll have to serve it on localhost, right? [01:59] Well, on localhost, I'd just 'branch' instead of 'push'. Comes out to the same thing, though. [02:01] So, say my directory-fiddled branch ends up at ~/good-branch [02:02] i can just say, bzr branch ~/good-branch /repos/pandasite/good-branch [02:02] oh of course [02:02] yes [02:02] Yep. [02:03] cd ~/good-branch ; bzr push /repos/pandasite/good-branch/ is _almost_ the same. Either would work. I'd just reflexively use 'branch'. [02:04] Ok. Great! === j_ack_ is now known as j_ack [05:56] anyone know about a bzr plugin for netbeans? [06:20] Ouch. [06:28] zoinks! [06:28] $ bzr branch bzr+ssh://myserver/home/jml/a/branch [06:28] bzr: ERROR: Generic bzr smart protocol error: bad protocol marker "error\x01Generic bzr smart protocol error: bad request 'bzr request 2'\n" [06:28] that's not a fun error message [08:28] Ug. One MORE error. [08:29] I can't checkout my branch from my mainline! Repository KnitPackRepository('file:///Users/andrew/clownfish/panda-mirror/.bzr/repository/') is not compatible with repository RemoteRepository(bzr+ssh://bamboo.fluther.com/repos/pandasite/.bzr/) [08:29] I inited my remote shared repo with --format=rich-root-pack so that I could import SVN branches into it. [08:29] you'll need to do the same for your local repository [08:30] ah... I have to init a local repository in order to do a checkout from a shared repo? [08:31] what command gave you that error? [08:31] bzr checkout bzr+ssh://bamboo.fluther.com/repos/pandasite/trunk panda-mirror [08:32] I get no error if i do a branch [08:32] is clownfish or panda-mirror a repository root? [08:33] no [08:33] er, clownfish, that is [08:33] it is not [08:33] it is a vanillay directory [08:34] (and no, you don't need to init a local repository to do a checkout from a shared repo) [08:34] hrm [08:34] i don't get it then [08:34] * bob2 tries a bzr+ssh checkout of a rich-root-pack branch [08:34] hah, same error [08:35] !! [08:35] booo [08:35] Is there any way to convert to KnitPack? [08:35] I have no need to communicate to SVN anymore... I just needed to port over from SVN [08:36] [09:55] there's a bug where initial branches over bzr+ssh always create local branches in the default format [08:38] awmcclain: if you use sftp instead of bzr+ssh, it should work [08:39] Aren't there weirdnesses with using sftp? Like losing some meta information or something? [08:39] Or... is there a way to convert rich-root-pack to knitpack? [08:39] awmcclain: the other workaround from http://irclogs.ubuntu.com/2007/12/13/%23launchpad.html is to use sftp for the first revision (-r1), then bzr up [08:40] I don't know of any weirdness from using sftp, aside from it maybe being slower [08:40] ug [08:40] what does bzr up do? [08:41] if it's on a lan, it shouldn't matter [08:41] it's not [08:41] and speed is important [08:41] ah [08:41] hrm [08:43] (bzr up would update you from rev1 to the current rev) [08:43] and in order to branch from SVN you _have_ to use rich-root-pack, right? [08:43] Right...makes sense [08:44] or rich-root, but the bug is that "co" always picks the current bzr default format, instead of the remote format [08:47] there is another confusing workaround [08:48] if you make a rich-root-pack repository on your local machine, then checkout into that, then it uses rich-root-pack for the check and thus works over bzr+ssh [08:48] thus making my intiial comment about not havbign to init a local repository quite wrong [08:51] And there's no command to remake the entire file repository, right? [08:52] hm? [08:52] bzr convert-file-format crappy-rich-root-format nice-knit-pack-format? [08:52] just guess on the syntax. ;) [08:52] s/guess/guessing [08:53] well, branches from svn require rich-root support, so no [08:53] right, but if i dont' need svn support anymore, can i convert them? [08:54] well, branches that didn't come from svn can be branched into a knit or pack repository [08:55] not sure if you mean "if I don't need to use branches that came from svn anymore" or "if I don't need my branches from svn to interact with svn anymore" [08:57] choice B [08:58] not afaik, but I know little about bzr-svn [09:01] sigh [09:01] ok [09:01] i'll try the workaround. thank you for your help! [09:43] bob2: still here? [09:44] Is there a better way of switching the source of my checkout from sftp:// to bzr+ssh:// than editing the branch.conf manually? [09:48] awmcclain: bzr switch bzr+ssh://... [09:48] great [09:48] that's from inside the checkout, right? [09:49] yes [10:17] guys, where does bzr keep revno in branch/repo? [10:17] nowhere, they are calculated [10:18] ("bzr revno" will figure it out) [10:18] hmmm... ok, so what files should I watch (say, with inotify) to get a heads-up when a revno changes? [10:18] bob2: yeah, I know, but I am trying to run something automagically when a revno changes [10:19] .bzr/branch/last-revision might work if you want only a single branch [10:19] surely a commit hook would be less hacky? [10:20] bob2: not if it's on a server and you want something like push hook [10:20] precisely [10:20] luks_: I don't have anything named "last-revision" in there [10:21] revision-history for old branches [10:21] but you should upgrade them :) [10:21] $ find ./ -iname last* -> ./checkout/last-revision [10:21] Can bzr checkout sourceforge svn on Ubuntu Gutsy? Fails on my machine. [10:21] oh, a checkout [10:22] emilis_info: bzr != svn [10:22] rysiek|pl, I know [10:22] rysiek|pl: bzr-svn! [10:22] I use the plugin [10:22] you said branch/repo, so I though you mean a branch [10:22] :) [10:22] ah [10:22] *thought [10:22] luks_: ell, it is a branch [10:22] *well [10:22] ls .bzr/branch [10:22] bzr selftest svn gives some output but ends in error: bzr: ERROR: Unable to import paramiko (required for sftp support): No module named paramiko [10:23] luks_: yup. revision-history is her [10:23] e [10:23] emilis_info: you can install python-paramik to fix that [10:23] emilis_info: but can't imagine how that would affect svn support [10:23] yep, upgrading it would be a good idea, unless you have a reason to use the old format [10:24] nope, just did a bzr upgrade (to 1.1) so it might be a good idea [10:24] bob2, I'll try now, thanks [10:24] hope it won't mess my 2000+ revisions branch... ;) [10:25] luks_: so, how can I upgrade a branch [10:25] aah [10:25] New bug: #194675 in bzr "encoding problem with `bzr merge --preview | less`" [Undecided,New] https://launchpad.net/bugs/194675 [10:25] bzr upgrade [10:25] * rysiek|pl is blind [10:52] doh... got it working finally... seems I had to use https://...sourceforge.net/... instead of svn+https://... [11:18] why are .bzr directories hidden on windows? this is confusing [11:18] because they're hiddon on unix [11:20] but most programs in unix stills shows them, on windows practicaly nothing shows them [11:42] Do we ever use UDP in our bzr:// communications? === maw is now known as mw === cprov is now known as cprov-out [13:10] New bug: #194716 in bzr "bzr pull should support --local" [Undecided,New] https://launchpad.net/bugs/194716 [13:21] I'm trying to do a bzr push by sftp on a lan and the command just goes away and does not return [13:21] How can I figure out what the problem is? [13:21] I know I can ssh from one machine to the other succesfully, although it does normally require a password [13:50] jelmer: Hey, you around ATM? [13:54] hello [13:55] was the format of the bzr.dev head updated again? [13:55] pulling remotely really takes long time again now [13:55] thanks [13:57] are you pulling into a rich root or knit repository? [13:59] how to see that? sorry i'm a newbie [14:00] what command are you running, and where? [14:01] i'm running bzr pull [14:01] in the top level directory of my local version of bzr.dev [14:02] and that's just a branch you made, and not in a repository? [14:02] is there simple way to convert checkout to lightweight checkout? [14:02] bob2: yes [14:02] hsn_: bzr reconfigure --lightweight-checkout should do it [14:03] * echo-are` thinks he should not delay reading the bzr manual by other things now [14:06] afaik the format hasn't changed in a couple of months, and the only other thing I could suggest is that pulling packs into other format repositories is slow [14:07] bob2: thanks, it worked [14:08] bob2: ok. i recall that on nov 2007 the format was changed, and i did update my local format. so perhaps this is because of the poor network i have. thank you [14:08] echo-are`: Does the output of 'bzr info' include 'pack' anywhere? [14:09] echo-are`: you can compare the output of "bzr info" and "bzr info http://bazaar-vcs.org/bzr/bzr.dev/" [14:09] Odd_Bloke: yes, it says "format: pack-0.92" [14:10] echo-are`: In that case it's likely to be network. [14:11] bob2: Odd_Bloke: thanks. i'll read the bzr manual right now :) === maw is now known as mw [14:51] bob2: when you mentioned "a repository", did you mean creating a repository with 'bzr init-repo' and executing 'bzr branch' etc in that repository? thanks [14:53] yes, if you did that with a different repository format to that of bzr.dev, it could cause a slowdown [15:22] bob2: thanks :) [15:35]