[00:04] jelmer: I just added a bug for that AssertError I saw: https://bugs.launchpad.net/bzr-svn/+bug/315666 [00:04] Ubuntu bug 315666 in bzr-svn "AssertError: Empty parent added, but child wasn't added" [Undecided,New] [00:09] fullermd: but I thought if a standalone tree had all of the revisions stored in .bzr? And when I copied it to the remote server and checked the log, all of the revisions were there... [00:09] - if [00:16] Well, if it was standalone, then yes. === Mario__ is now known as pygi === ja1 is now known as jma === jma is now known as jam [03:29] hi folks, is there an up-to-date ppa for bzrtools and bzr-svn? [03:29] i'm on intrepid [03:30] the bzr ppa has really out-of-date bzrtools packages, and the bzrtools lp project doesnt have its own ppa [03:30] oh i see, the nightly ppa has bzrtools [03:31] never mind me... [03:33] hm, but the bzrtools .deb in the nightly bzr ppa reports version 1.10 (using "bzr plugins"), and then complains it's older than the bzr .deb, which is 1.11rc1: [03:33] 0 seb@water /home/seb/work/bioserve/bionet2.bzr/subtopic/client/watcher> bzr shelf ls [03:33] Plugin "Bzrtools" is not up to date with installed Bazaar version 1.11rc1. [03:33] There should be a newer version of Bzrtools available, e.g. 1.11. [03:33] Patches on shelf 'default': None [04:17] I think i found a bug.. or workflow problem with bzr.. and would like an explanation of it. If i run a test and pastebin in it, can anyone review my actions? [04:22] http://dpaste.com/107341/ someone please check it out. Its annoying because it wont let me create a new branch and switch to the newly created branch.. [05:09] hola [05:16] has someone used bazaar for web sites ?? [05:37] El_Guille2: take a look to the bzr-upload plugin [05:38] yeah .. i did xD [05:39] it is gonna make my life much easier [05:55] Hi, how can you see bzr's progress on branching? [06:39] Hi, I keep getting 104 errors when trying to do bzr branch lp:do [08:34] how does the loggerhead serve-branch --user-dirs option work? [08:53] hi guys [08:54] I cannot seem to find a definite answer to this: [08:55] can a branch hold other branches? or, can a repo hold other repos [09:00] Depends on what you mean by "hold". [09:00] You can put a branch underneath another branch, and a repo underneath another repo. But that doesn't forge a link between them. [09:00] /path/to/repo1/somedir/repo2/branch [09:01] so that I could bzr clone /path/to/repo1 [09:01] You can't clone a repo in the first place. [09:01] AND bzr clone /path/to/repo1/somedir/repo2 [09:01] AND bzr clone /path/to/repo1/somedir/repo2/branch [09:02] simply put, I need finer-grained control over what can be cloned/checked-out [09:03] Certainly you could put a branch underneath another one, and clone either one. But grabbing the outer won't grab the inner; the outer doesn't know anything about it, other than as an unversioned directory inside it. [09:03] ah [09:03] Eventually, nested tree support will redefine some of that. [09:03] well, that defeats the whole purpose of it [09:04] thing is, I have a project that uses as it's core another bzr-versioned project [09:04] the idea was to have: project-branch/ and project-branch/core [09:05] so that changes in project-branch/core can be bzr merged upstream [09:05] but bzr clone project-branch gets the whole deal, along with project-branch/core [09:06] and... project-branch is only a mere branch inside a wider meta-project's repo [09:06] The only way that would work right now would be if you actually merged core into project-branch. And then those revs couldn't be directly merged upstream, they'd have to be cherry picked. [09:06] right [09:06] What you want there is by-reference nested trees. [09:07] I assume something like project-repo/core-branch and project-repo/project-branch [09:07] And that's a "someday" feature. [09:07] would work as expected? i.e. bzr cloninig project-repo would get me both branches [09:07] You can't clone a repo. Only a branch. [09:08] Shared repositories aren't semantic units in bzr. [09:08] ah [09:08] so there would be no single operation on the repo I could perform to get all the branches within? [09:09] Not built into bzr, no. [09:09] There's no way to ask a repo "what branches do you have"; it doesn't know. [09:10] so, what's the point, actually, in creating a repo, instead of a "dumb" directory with branches within? [09:11] It saves space and I/O, since you only have one copy of common history. [09:11] If you've got two branches that aren't related, of course, you don't save anything. [09:12] right [09:12] thanks, that got a lot things cleared-up [09:12] There's a command 'branches' in bzrtools that looks under a dir and tries to list all the branches there. [09:13] But it does it by walking the dir tree and asking each dir "Hi there, are you a branch?" [09:14] (works pretty much the same whether you're scanning a repo, a bunch of standalone branches, a dir tree with 5 different repos in it, etc) [09:14] I've found a plugin or two that more or less do what I need [09:16] There's been talk about a scmproj plugin (or some name like that) lately, which could help. [09:18] but come to think about it, those nested trees would be awesome [09:19] Yeah. The feature would be perfect, if it were done :) [09:19] scmproj (AIUI) gives you something similar, with a little outside help. I could be wrong though; I'm not watching it too closely. [11:18] Hi - Is there a way to check if there is a working tree in a remote location? [11:20] Unfortunately BzrDir.has_workingtree allway raises NotLocalUrl weather there is a working tree or not. [11:21] Note: I do not intend to open the working tree remotely. I'm actual want to check that it is not there. === EarthLion is now known as Ollie| [12:30] Is there a more up to date package source for Debian Lenny? [12:41] Get packages from experimental and rebuild? === fta_ is now known as fta === asac_ is now known as asac [14:46] http://arstechnica.com/news.ars/post/20090107-dvcs-adoption-is-soaring-among-open-source-projects.html [16:51] Hello. Is it possible to see the history of a specific file only, not the whole branch? [16:52] bzr log [16:53] I see, thanks [17:13] why does cmd_missing have to lock the branches twice? [17:13] it does so in the cmd_missing class and in bzrlib.missing.find_unmerged [17:15] did it drop the first lock by then? [17:16] no [17:37] related to vadi2's question: is it possible to see the history of a specific file that existed previously, but is deleted in the tip revision? [17:54] hello i am a web developer and i am new at version control systems [17:55] i am uploading a website, i use bzr-upload plugin and it is working but i have two different files locally and remotely [17:55] there is a mysql conection php file lets say conection.php [17:56] but they are different .... how should i use bazaar in this case ??? [17:57] I'd suggest to not version them [17:57] version the default configuration in a different file instead [17:57] e.g. config.php.default is versioned, config.php is always local and not versioned [17:58] that would be just deleting the files from bazaar right [17:58] deleting and keeping them of course ... [17:59] yes [17:59] maybe somebody has a different idea, but this is what works for me [18:02] ok thanks i'll try that [18:22] LarstiQ: any quick idea for running anyvc tests with different bzr versions? [18:32] ronny: you need to have different versions of bzrlib in the python path [18:33] hmm [18:33] i wonder if i can make up a test-rerunner that runs the testsuite once per vcs + version and collects the results [18:33] combined with a setuptool to set those up === Leefmc is now known as Leefmc-away [19:05] bzr-upload remembers only one old location and not the last i used [19:05] how can i get it to remember a specific location ??? [19:06] or maybe i'll just use an alias .. [19:06] Ambro: bzr upload --remember ? [19:08] thanks [19:08] can i get it to remember the password ?? .. i tried putting it in the remembered location but it asks me for it again [19:20] LarstiQ: btw, i finally found a way to correctly abstract bzr [19:21] ronny: oh? [19:22] LarstiQ: i have 3 basic entities - repo, branch, workdir [19:22] they will be in arbitar relations from 1:1 up to n:m [19:22] and they can be located together [19:22] ronny: heh, that is exactly what the bazaar concepts are too [19:23] so you're modelling bazaar 1:1 then [19:23] no [19:23] branch/workdir relations are different [19:23] how do they differ? [19:23] workdirs may not have a single asociated branch [19:24] in monotone it can be arbitrary [19:24] ah yes [19:24] do they need to be tied to 1 repo though? [19:24] or does that not matter [19:24] and in git/hg the model of workdir=repo + n branches fits [19:24] Hi, is there any way I can keep (777) permissions of a folder? [19:24] * LarstiQ nods at ronny [19:25] as for darcs, repo=workdir=branch [19:25] so its like a standalone bzr branch [19:26] workdirs/branches will have "tags" they may be movable/fixed and local/distributed [19:30] hi am having problems doing bzr co on a 512mb server because it taken 100% of memory and swap (about 1.5GB - kernel) [19:30] is there a way to get around this kind of memory usage? [19:34] i will try to copy the .bzr part and bzr co from that, i think i did that once and it worked === EarthLion is now known as Ollie| [20:14] treeform: What version of bzr? Memory usage tends to get better over time. [20:17] 1.8 === Guest1132 is now known as Spaz === Mario__ is now known as pygi === Leefmc-away is now known as Leefmc === mark1 is now known as markh === asac_ is now known as asac [23:16] Does anyone have experience with setting up a Bazaar shared repository with Redmine? When I point Redmine to my Bazaar repository, it tells me "The entry or revision was not found in the repository" and the error "bzr: ERROR: Not a branch: /path/to/my/repository/.bzr/branch/" shows up in my Apache logs. I know Bazaar is working fine because I've had Redmine working with a single branch before. [23:17] maybe it can only work with branches? [23:17] Is that error verbatim? If so, it looks like there's a little configuration you need to da :) [23:19] No, it's not verbatim. The path in Redmine is correct, I just took it out of the error message. [23:30] If it's only capable of working with branches, is there a way of doing multiple branches per project (sub-branches or something)? [23:32] Since Redmine will only take one repository per project I mean. If it can only work with a branch, is there a way to work with multiple branches inside that one branch? (So there could be a development branch, stable branch, releases, etc.) [23:32] This sounds like more of a Redmine question. [23:33] Okay, I've tried finding out there and got to response at all, so I was hoping someone here could help. Thanks anyway. [23:33] No repsonse, rather. [23:55] Hello. Can anyone help me get loggerhead to work on apache? I have it running on the localhost:80, but cant get it to work when someone types in : http://bzr.website.com [23:58] To be clear i have gotten it to show up using mod rewrite to force everything to localhost:8080... however, loggerhead seems to screw up and displays links for files as localhost:8080, disregarding the mod rewrite