[00:06] how do I get the path on the file system for a BzrBranch7 object? [00:22] Hi I created a shared repo with -notrees [00:22] is this a good idea when I use bzr explorer I see no files - does this mean I will never be able to browse the repo only working copies on the repo? [00:22] branch.base did it... [00:23] servertood: you can checkout a working tree with "bzr checkout" [00:23] yeah I did that [00:24] but in the gui bzr explorer when I select the repo [00:24] I see no files I assume because I created it with notrees [00:27] ok Im in explorer now and I commited files [00:27] I guess I was expecting to see them in the main view [00:27] I know see them in the pane to the bottom right under working tree [00:39] if I bzr added a large number of files [00:39] and realized I didnt ignore a certain file type [00:39] is there a way to unadd them [00:43] bzr rm --keep iirc [00:44] * speakman still don't know how to get the file system absolut path of a repository from within bzr smart server [00:44] lifeless: ping [00:50] hi [00:50] whats up? [00:57] does bazaar come with an http repo browser? [00:57] I havent run bzr server yet wasnt sure if that does it [01:03] servertood: It's called loggerhead [01:03] k [01:04] ty === BasicPRO is now known as BasicOSX [01:53] Im not a python dude [01:53] loggerhead plugin blows up saying paste.exception pkg is not there [01:53] having no luck getting it installed any ideas [01:53] easy_install wont install either saying its looking for python2.3 [01:54] I have python 3 [01:54] Im on osx [02:07] lifeless: how do one get the file system path of a repo in a commit hook routine when bzr is running as a smart server? [02:08] lifeless: the URL of the repo is somewhat obfuscated; filtered-172359628:///timespot/facelift-pure/ [02:09] lifeless: when committing directly to that repo, the URL is file:///srv/bzr/repo/timespot/facelift-pure/ [02:09] lifeless: the smart server is run as; 4155 stream tcp nowait bzr /usr/bin/bzr /usr/bin/bzr serve --inet --directory=/srv/bzr/repo --allow-writes [02:17] lifeless: I'm using it to send change notifications to Buildbot fwiw === BasicPRO is now known as BasicOSX [02:28] speakman: you can unwrap that in python [02:29] have a look at the code [02:29] its a pseudo chroot to prevent config files or the VFS etc being used to attack the host file system [02:46] lifeless: ok, I did give it a try but I couldn't figure where to do the unwrapping [02:47] now getting some sleep, then I might give it another try [02:47] g'nite [02:59] hi, is there gui support for committing only part of the changes within a file? (Like it is possible with TortoiseHG / Mercurial) [03:01] I am considering to switch from Mercurial to Bazaar [03:02] Sorry, my notebook went into suspend mode. Did someone answer my question? [03:38] hi jonnydee [03:38] uhm [03:38] committing only some changes - no ui support for doing that in one operation [03:38] (AFAIK), but we'd like it [03:38] you can do it by hand using the 'shelve' functionality, which i think *is* exposed in the GUIs [04:16] lifeliss, thanks for your response. so with shelve I would select the hunnks that shouldn't be committed, shelve them away, and then commit? [04:16] s/lifeliss/lifeless === gthorslund_ is now known as gthorslund === Tak|Work is now known as Tak_ [12:40] lifeless: please have a look at (and maybe update) https://bugs.launchpad.net/bzr/+bug/270267 [13:52] $ bzr mv --after src/ts35_spec/window_ctrls.c src/window_ctrls.c [13:52] bzr: ERROR: An inconsistent delta was supplied involving '', 'ts35_spec-20080306092141-c3d3hfzalp83ngpc-1' [13:52] reason: Parent not in inventory. [13:56] And this is no SVN import or anything - pure bzr from the beginning [14:04] how do I make bzr detect file moves? [14:06] did you try bzr mv --auto ? [14:06] You perform the move by bzr mv old new [14:06] Or if you've already done that, try bzr mv-id ... [14:06] mv-iD? [14:06] mv auto? [14:06] --auto Automatically guess renames. [14:06] Tak_: didn't work [14:07] So mv-id it [14:07] removed: src/ts35_spec/barcode.c [14:07] unknown: src/barcode.c [14:08] $ bzr mv-id [14:08] bzr: ERROR: unknown command "mv-id" [14:08] Ohwait, just mv ;) [14:08] bzr mv old new [14:08] and next time, just use that to rename the file in the first place [14:08] $ bzr mv src/ts35_spec/barcode.c src/ [14:08] bzr: ERROR: Could not move barcode.c => src: src/ts35_spec/barcode.c is not versioned. [14:09] LeoNerd: I use to. But this time I forgot. [14:09] * LeoNerd nod.. [14:09] LeoNerd: Moving all files back to the originating place doesn't work either [14:09] bzr mv old new as I said [14:09] $ bzr mv --after src/ts35_spec/barcode.c src/ [14:09] bzr: ERROR: Could not move barcode.c => src: src/ts35_spec/barcode.c is not versioned. [14:09] Since old doesn't exist and new is unversioned, bzr will work out what happened [14:09] Give the full paths [14:09] $ bzr mv --after src/ts35_spec/barcode.c src/barcode.c [14:09] bzr: ERROR: An inconsistent delta was supplied involving '', 'ts35_spec-20080306092141-c3d3hfzalp83ngpc-1' [14:10] reason: Parent not in inventory. [14:10] bzr add src/ [14:10] $ bzr add src/ [14:10] adding src/barcode.c [14:10] bzr rm --keep src/barcode.c [14:10] Then you can 'mv' it OK [14:10] $ bzr status [14:10] removed: src/ts35_spec/barcode.c [14:10] added: src/barcode.c [14:11] $ bzr mv src/ts35_spec/barcode.c src/barcode.c [14:11] bzr: ERROR: An inconsistent delta was supplied involving '', 'ts35_spec-20080306092141-c3d3hfzalp83ngpc-1' [14:11] reason: Parent not in inventory. [14:12] I'd be suspiscious of that "inconsistent delta" error... [14:15] really... [14:20] are there any patch-reader tools outthere? [14:21] Trying to solve this by making a .patch-file to be applied into a new branched tree. But the files is gigantic and I'd like to get an overview of it. [14:21] Something like gdiff for arbitrary patch file [14:27] Which OS? [14:27] ubuntu 10.10 [14:27] bzr ver 2.2.1 [14:29] Not sure.... you could just apply the patch and view it with gdiff? [14:29] Or you could shelve it in the tree you've got and unshelve it in the other tree? [14:34] how do I move shelves? [14:35] Move it where..? [14:36] If you want to move the entire shelf with all its items, into a different workdir; I believe it's just a directory, so you can just 'mv' it [14:43] move from branch to branch [14:44] Or you could render your current branch a checkout instead of a branch and switch it - but from the sound of it it might be too broken to allow that [15:16] hey, did any of you guys catch the recent python-dev thread about maintenance branch workflow? [18:09] hello, in order to check in which version a bug introduced I want to go from revision x (still working) to revision y (known not to work) step by step. [18:09] what is the easiest way to do this. Currently I have a a checkout and branch from a launchpad project [18:11] theadib, you can "bzr revert -r x" [18:11] theadib, `bzr bisect` [18:12] theadib, You might need to install the plugin ; if your "bad" property is testable in an automatic way you can even script it to locate the "bad" commit [18:12] beuno, does this revert all changes until revision x? [18:12] what is lp url for pushing branch into project which is not mine [18:12] theadib, yes [18:13] hsn, bzr push lp:~youruser/project_name/branch_name [18:13] beuno, and what to do to go then to revision x +1? [18:14] theadib, so, if X is tip [18:14] you can do [18:14] bzr revert -r -2 [18:14] then, bzr revert -r -3 [18:14] and so on [18:14] that will step back one revision [18:20] ok, thanks. How do I know which revision I am in? bzr info does not tell this information. [18:21] theadib, right, you know because you specified it in the command :) [18:21] so you can either use -2, -3, -4 [18:21] or just substract one yourself [19:11] hey