=== cjwatson_ is now known as cjwatson === Ng_ is now known as Ng === Spaz_ is now known as Guest27683 === Spaz|afk is now known as Spaz_ === _thumper_ is now known as thumper [02:04] $ bzr push sftp:/// [02:04] No revisions to pull. [02:04] wtf? [02:06] did you specify trunk/ perhaps? [02:06] :) [02:07] It's the "pull" bit that weirds me out. [02:14] jml: using loom? [02:14] yeah. [02:14] bug xxxxx [02:15] (its open) [02:15] it took me a while to figure out it was a loomified branch [02:15] export-loom ftw [02:24] I'm working on parsing the bzr error messages in my program. I can't seem to find if there is a standard way of doing error messages in bzr. Do all error messages start with "bzr: ERROR: "? [02:25] lifeless: can you merge my testresources branch please? [02:28] libwilliam: pretty much. See bzrlib.trace.report_exception [02:28] spiv: thanks [03:22] * emmajane waves. [03:22] I wanted to give the bzr_upload plugin a try, but it doesn't seem to want to load. [03:23] I've downloaded it from launchpad and run the setup.py script, but I'm still getting: [03:23] Unable to load plugin 'bzr_upload' from '/home/emmajane/.bazaar/plugins' [03:57] Hello, can bazaar commit to a repository through the FTP protocol? [03:57] push* [04:00] And is it possible to grab the latest working version of a repository - not the entire history? [04:00] alecwh: yes you can use FTP. [04:00] emmajane: how would the command look, with a username and password, and can I get bzr to save the location, so I don't need to type it each time I want to push? [04:01] I believe it's just: bzr push ftp://username@ftpserver [04:01] emmajane: yes, but I have a password too. [04:01] does it not prompt you for a password? [04:02] emmajane: I haven't tried yet, I just assumed there was another variable to set. [04:02] thanks! [04:04] I think it should just work. [04:15] alecwh: try also: bzr help [04:15] and bzr help [04:16] http://doc.bazaar-vcs.org/bzr.dev/en/user-reference/bzr_man.html [04:21] emmajane: thanks [04:21] did it work? [04:31] emmajane: really sorry, haven't tried yet (not at my computer), I'll get back to you later though [04:31] np === beuno-afk is now known as beuno [07:49] can someone suggest a tool to keep track of bzr branches? (other then LP...) [07:54] Kamping_Kaiser: keeping track in what sense? [07:55] mwhudson, via a web interface, as i recall (sorry, i wasnt clear) [07:56] Kamping_Kaiser: there's loggerhead [07:56] I am having trouble using bzr-svn plugin. Tried both ubuntu hardy package and trunk version. Ubuntu hardy package segfaults on bzr selftest svn. [07:56] it can browse directories now, so you can just point it at the directory containing all your repos, for example [07:56] mwhudson, thanks, i'll go and check it out [09:00] nosklo: have you tried installing the most recent bzr-svn locally (in ~/.bazaar/plugins)? [09:00] that bit me yesterday [09:01] fdv, using ubuntu package bzr + recent bzr-svn? [09:01] nosklo: what was the question? [09:01] fdv, getting bzr-svn to work somehow [09:02] nosklo: yes, but what did you just ask me? [09:02] whether I use "ubuntu's" bzr and not ubuntu bzr-svn? [09:02] fdv, I can't make it work. I have tried: installing bzr and bzr-svn packages, and installing bzr.dev and bzr-svn trunks [09:03] ok.. [09:03] fdv, I am asking if maybe combining the package with the trunk [09:03] which bzr version? [09:09] nosklo: if you get your packages from http://ppa.launchpad.net/bzr/ubuntu it seems to me you _should_ be fine [09:10] fdv, I will try. [09:11] nosklo: otherwise, check which bzr version you have and compare to http://bazaar-vcs.org/BzrForeignBranches/Subversion#releases [09:12] I have bzr 1.6.1 and bzr-svn 0.4.12, which at least to me seems to be a combination that works === beaumonta is now known as abeaumont [09:39] uhm.. pqm depends on config-manager, which in turn depends on pybaz. the latter is no longer in use, is it? === beaumonta is now known as abeaumont === fta_ is now known as fta [13:47] hi [13:47] could someone take a look at the changes between aaron.bentley@utoronto.ca-20070517163555-3i7jamitmffdg85l and aaron.bentley@utoronto.ca-20070611021058-7mqy4fsayv27zper [13:48] Leonidas: Umm, in what context? [13:50] Odd_Bloke: there is a change with the fileid TREE_ROOT and I'd like to ask someone what that means. [13:51] Leonidas: In what branch? [13:51] Odd_Bloke: bzr.dev [13:51] Right, that's all I was looking for. :) [13:52] iter_changes gives me ('TREE_ROOT', (None, u''), True, (False, True), (None, None), (None, u''), (None, 'directory'), (None, False)) [13:52] Leonidas: It'd be more normal to use revnos for a branch like bzr.dev. [13:53] Odd_Bloke: right, but I don't have the revno. [13:54] when working with bzrlib, one almost never gets any revnos [13:57] abentley: do you have a moment and can take a look on that changeset? [13:59] Leonidas: That looks like it's creating the root directory. [14:00] abentley: how is this possible? The root directory must have existed earlier. [14:00] There may have been a different root directory [14:01] Yes, the root directory for aaron.bentley@utoronto.ca-20070517163555-3i7jamitmffdg85l was "tree_root-20070410133226-3795pjcs6oz73ncz-1" [14:02] abentley: how can something like this be reproduced? TREE_ROOT looks like it is something special, whereas tree_root-2007... is not. [14:03] Leonidas: Using bzrlib, you should be able to set whatever tree root you want. [14:07] abentley: how? By modifiying a revision tree's inventory? [14:08] Leonidas: By calling set_root_id on a WorkingTree. [14:08] ah! [14:09] I should point out that released versions of bzr will always select TREE_ROOT if the repo format isn't a rich root format. [14:11] but, erm, what use does it have to be able to change the TREE_ROOT? I'm trying to understand this, but somehow a the root directory cannot track any changes like setting it +x or something. [14:12] The root directory can do anything any other directory can do. Especially, it can be moved and renamed. [14:14] Or deleted, even. This tends to happen when splitting one tree into two. [14:14] I see, didn't know that. I always thought about the root directory to be just a container for the content. [14:16] abentley: ok, thanks a lot. Now that I can reproduce this in simple repositories, I can figure out that to do. [14:16] you're welcome. [15:34] abentley: I suppose there needs to be a file/directory with that fileid already created to set_root_id, right? But the ``bzr`` program seems not to have any problems with nonexistent root_ids [15:41] Hi! Does bzr supports nested trees? [15:58] Zelgadis: Apparently, yes. [15:59] Teddy: how? [15:59] Zelgadis: http://bazaar-vcs.org/NestedTrees [16:00] I might need to update that soon [16:00] Zelgadis: I guess the answer is: it's not where we want it yet, but you can do a number of things already [16:01] wow, thank you [16:01] Zelgadis: if you can desribe your use case more clearly I can give more detailed directions. [16:03] ok. I have a directory with a lib, doc, layouts and episodes [16:04] every person, who works on particular episode will need lib folder [16:04] but some person don't need lib folder, he just wants the doc folder [16:06] that's the complex case. But I can simplify it. [16:08] Zelgadis: I see, nested trees would ease working like that [16:09] yep. The main purpose is to reduce bandwidth usage [16:09] every episode is extremely huge [16:09] Zelgadis: right, I would recommend keeping each episode in its own branch. [16:10] Zelgadis: but you can work with multiple branches like that without having nested-trees, it will be more manual work that way [16:11] LarstiQ: If I'll do it without ConfigManager then everytime user do a checkout a whole repository history will be retrieved, right? [16:13] Zelgadis: cm doesn't impact that aspect, it just takes away some of the manual aspect of checking out different trees into a hierarchy [16:13] Zelgadis: so, you have a couple of seperate problems to be solved [16:14] Zelgadis: one thing you mentioned is breaking up into multiple branches because each individual episode is very big [16:14] Zelgadis: another thing might be that you don't want all history for one specific episode when you're working on it [16:15] Zelgadis: options to help there are stacked branches or lightweight checkouts [16:15] LarstiQ: yes, lightweight checkouts - is a option because I've choosed the bazaar among others VCS [16:15] Zelgadis: what is the workflow like on an episode? Do people need to work against the history often? [16:16] LarstiQ: what is a stacked branches? [16:16] Yes we doing commits often [16:17] Zelgadis: stacked branches allow you to have only some of the historical data yourself, and for older revisions to talk to the branch they are stacked upon [16:17] Zelgadis: it's a feature introduced in 1.6, see --stacked in `bzr help branch` for instance [16:18] Zelgadis: for committing you don't need to access history, diff and log are cases where you need older revisions [16:20] LarstiQ: But if I want to commit locally? [16:20] (with a lightweight checkout that's seems impossible) [16:20] But that's not a big problem. [16:21] Zelgadis: correct, a lightweight checkout needs to contact it's master for everything [16:21] Zelgadis: a stacked branch doesn't need to, it can operate locally [16:21] nice [16:22] Zelgadis: http://doc.bazaar-vcs.org/bzr.1.6/en/user-guide/index.html#using-stacked-branches [16:23] Zelgadis: out of curiousity, what is an episode? [16:23] cartoon episode - source files (.blend, .sif, .xcf, .kra) [16:24] ooh, cool [16:25] LarstiQ: You may find more at http://morevnaproject.org/ [16:25] althrough, not much there yet [16:27] LarstiQ: So, back to the NestedTrees problem - all I need, is just organize folders in branches [16:28] Zelgadis: yeah [16:29] Zelgadis: it sounds to me like most people will only have one or two branches (lib/episodeX or doc) at a time [16:30] yep [16:31] Zelgadis: in that case it isn't too much overhead to just get them by hand [16:33] the problem is what I need some files (like Makefile and README) at the root of branches [16:33] outside the branches [16:34] Zelgadis: you could do something like: cd morevna; bzr branch http://host/environment; cd environment; bzr branch http://host/episodeX [16:35] LarstiQ: ...and tell to .bzrignore in environment to ignore the subdirectories? [16:35] where environment has the Makefile, README and all other things you need for all of them [16:35] Zelgadis: bzr will do that automatically [16:36] or well, I should rephrase that [16:37] Zelgadis: if you have a bzr branch in another bzr branch, bzr status will not list all the files in that inner branch as unknown [16:37] cool! [16:37] Zelgadis: it will see that the directory is a bzr branch, and not recurse into it [16:37] didn't know that - that simplifies things! [16:37] Zelgadis: it will show up only once as an unknown dir [16:38] but we could still add that unknown dir? [16:38] LarstiQ: it will help people to figure out what branches they could need [16:39] Zelgadis: not `bzr add` [16:39] Zelgadis: what do you mean, figure out what branches they need? [16:40] LarstiQ: so, they appear as unknown, but 'bzr add' won't add them? [16:40] (and not recursing into unknown directories is something bzr does for all unknown dirs btw) [16:40] Zelgadis: correct [16:41] Zelgadis: try: cd /tmp; bzr init foo; cd foo; bzr init bar; bzr st; bzr add bar; bzr st; [16:42] LarstiQ: Ah, understand. That's ok. [16:43] LarstiQ: Thanks alot! [16:44] Zelgadis: np :) [16:44] back to work ^___^ [16:55] bzrlib.errors.InconsistentDelta: An inconsistent delta was supplied involving 'newdir/secondfile', 'secondfile-20080921155404-xxpouw03i8s29crx-3' [16:55] reason: This was marked as a real delete, but the WT state claims that it still exists and is versioned. [16:56] hmm, this is strange. [16:56] I just tried to change the root_id to the id of the subdirectory newdir, but that does not seem to work. [16:57] Leonidas: that would give two paths with the same file_id, no? [17:12] lifeless: ping? [17:12] hi [17:13] how can i convert a branch with rich root support into one without rich root support? [17:13] ronny: bzr upgrade (has parameters) [17:14] anybody know if you can combine two bzr trees for separate projects (i.e. no common history) into one? [17:14] stewart: bzr merge -r 0..-1 otherbranch [17:14] stewart: it goes only in one direction [17:15] stewart: you may want to move the contents of one of them into a subdir to reduce conflicts [17:15] stewart: i can convert from non-rich to rich, but not back [17:15] ronny: okay - not 100% of that. [17:15] LarstiQ: that's what we'd do. it's adding a storage engine into the mysql tree that's been maintained externally. [17:15] ronny: that would be because a non-rich root format can not represent all of the information in a rich root format [17:16] ronny: so by default that isn't possible. May I ask why you'd want to do so? [17:16] stewart: ah, I see. [17:16] cause the remote is not a rich repo [17:16] and i want to push [17:17] however bzr doesnt let me to [17:18] right, for the reason I just mentioned. [17:18] ronny: upgrading remote isn't feasible? [17:19] i could do that, but its just my branch of another project, i dont want to enforce anything and i dont want to redo the cahnges i did [17:19] ronny: right. [17:19] what kind of metadata does the rich-root hold, cause im pretty sure i dont use any of it [17:19] LarstiQ: just tested the merge command above, worked great. thanks! [17:21] ronny: the root path gets to have a real file_id, which enables you to move it and such. [17:22] ronny: I'm looking for ways to help you deal with this, without having to exercise bzrib directly. [17:23] next up, rebase [17:24] hu? [17:24] ronny: I looked at creating a bundle and applying that, didn't work. Now I'm looking at rebase. [17:25] hmm, the __dozenz__ of partially incompatible repo formats are a pain :/ [17:25] __dozenz__? [17:26] well, i count at least 6 of them [17:26] well, more like 13 [17:27] ah, dozens, not a python __attribute [17:31] LarstiQ: no, not really, since the newdir has a different fileid than '' which has the fileid TREE_ROOT. [17:32] Leonidas: but you said you dit set_root_id(newdir_id)? [17:33] ronny: I can't really think straight right now [17:34] ronny: but I'd try the list next === BasicPRO is now known as BasicOSX [18:30] LarstiQ: yeah, I had a working tree with the root id set to TREE_ROOT and then I tried changing it to the file-id of my subdirectory [18:58] anybody around who might have a hint or two on how to get pqm working? [18:58] or are there alternatives? [19:42] fdv: What are you struggling with? [19:54] Odd_Bloke: pqm requires config-manager, which requires pybaz [19:55] fdv: Yes. [19:55] afaik, baz, and therefore pybaz, is discontinued [19:55] Yes. [19:55] It's a bug in CM, rather than PQM. [19:55] yes, I presumed as much [19:56] but I don't really know neither pybaz, nor bzrlib very well, so migrating is a rather tough option :) [19:56] fdv: PQM doesn't require you to use baz. [19:57] It just required libraries for using baz to be installed. [19:57] Which is why it's such an irritating bug. [19:57] right, so pybaz is enough? [19:57] fdv: Enough for what? [19:58] If you want to use PQM for bzr, you only need what's in PQM. Unfortunately, PQM currently requires config-manager which requires pybaz, but that's orthogonal to what you really need. [19:58] fdv: What platform are you on? [19:59] Odd_Bloke: ubuntu [19:59] sorry, was distracted a moment [20:00] fdv: 'apt-get install config-manager' should be enough for PQM to not complain about it. :) [20:00] the config-manager package is broken, as it depends on pybaz, but that one doesn't exist [20:00] ...anymore [20:01] *shakes fist at Ubuntu* [20:01] still, when trying to use config-manager from source, there are lots of 'import pybaz' statements in there [20:01] so I can't really see how it'd work [20:01] oh, right [20:01] Try using https://code.launchpad.net/~daniel-thewatkins/pqm/config-manager [20:02] maybe that code is only called when one uses baz [20:02] fdv: That code _should_ only be called when one uses baz. [20:02] right, I see [20:02] Unfortunately, it is not. [20:02] oh [20:02] bummer [20:02] Hence the whole issue. :p [20:02] sounds like it should be fairly easy to fix [20:03] I see [20:03] fdv: Patches welcome. ;) [20:03] hehe :) [20:03] I've spent a little while looking at it (I worked on PQM over the summer), but didn't get very far. [20:03] so config-manager is only needed by pqm when used with baz, is it so? [20:03] fdv: Nope, CM isn't _needed_ even then. [20:03] ok, but it _can_ be used [20:04] Yeah, but it also _can_ be used when you're using PQM with bzr. [20:04] but it might also be nice to have with bzr? [20:04] right [20:04] It should be completely independent of baz. [20:04] But it's not. [20:04] I see [20:05] fdv: Actually, that's not the branch you should use. [20:05] oh [20:05] fdv: It depends on a lot of other unmerged work. [20:06] right [20:06] fdv: If you don't want to use config-manager, ISTR that just removing the imports works. [20:06] Which is nasty, but will let you get on with things. [20:07] ok [20:07] (another issue, btw, is that config-manager won't build without the dir ./libgetopt, which is not there, but I nicked it from the .deb) [20:07] Odd_Bloke: what would I need config-manager for anoway? [20:08] fdv: If your build required you to pull in a few branches. [20:08] It's _kinda_ like svn:externals. [20:08] aha [20:08] makes sense [20:08] kind of hard to put the pieces together without prior knowledge :) [20:09] (this channel, of course, is _very_ helpful in that respect :)) [20:09] fdv: Yeah, PQM is still fairly obtuse. [20:11] config-manager seems to be a bit out of date, actually [20:11] though maybe I just don't understand it [20:11] Well, it depends on pybaz, which is a reasonable indicator. :p [20:12] under implementations, there is only arch_vcs.py and fake_vcs.py [20:12] Yeah, that's where the baz and bzr stuff should be. [20:13] only baz, afaics [20:13] Whereas currently it's intermingled with the core code. [20:13] aha [20:13] I see [20:14] doesn't sound like a very pleasing place to start :) [20:14] Odd_Bloke: thanks a lot, at least I know part of the rationale now and I might be able to get it together [20:14] fdv: No worries. :) [21:34] Odd_Bloke: wouldn't it make sense in pqm to import config_manager only inside the two methods using it? [21:34] I'm not sure if I see why that is ugly [22:01] fdv: It would make sense, I think. [22:14] stewart: yo [22:37] I was doing some messing around with the different commands to see what they did and now my tag revnos are listed as ?.. My guess is because I uncommitted the revisions that had tags. So if this is the case I was wondering if those tags should even exist? [22:40] libwilliam: Those tags will point at the old revisions. The '?' just means that those revisions don't have a revision number in this branch (as they are not part of the history). [22:42] Alright, well I am trying to do a bzr log -r tag: and I am getting a crash [22:42] Is this worthy of a bug report? [22:43] libwilliam, please [22:43] jelmer, k [22:44] Is there a way for me to use "meld" to resolve conflicts when merging? [22:48] jml, hi [22:48] I've given your lp stacked branch experiment a spin [22:48] and I get this: http://paste.ubuntu.com/49082/ [22:49] I have a shared repo [22:52] beuno: oh, the branch called 'experiment' is broken. [22:53] beuno: but even if it was ok, if you branch it locally, it should work, and won't be stacked unless you say --stacked === davi__ is now known as davi [22:56] Is there a way for me to use "meld" to resolve conflicts when merging? [23:00] jml, that explais it, thanks === beaumonta is now known as abeaumont