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