[00:00] hmm, that doesn't make sense to me either [00:00] abentley, ^ [00:00] abentley: http://bundlebuggy.aaronbentley.com/request/%3C48859468.40605%40xs4all.nl%3E says conditionally approved [00:00] http://article.gmane.org/gmane.comp.version-control.bazaar-ng.gtk/1294 says semi-approved [00:01] poolie: at the risk of repeating myself.. what's the status on 1.6 ? :-) [00:02] poolie, will you do a rc or something or are there other things you'd like to get fixed first? [00:16] jelmer: (fwiw, there have been some emails about that) [00:17] jelmer: (but it's a busy list, so easy to miss things) [00:19] How do I fix this: Unable to import paramiko (required for sftp support): No module named paramiko [00:19] Traveler9: You install paramiko. [00:20] How do I do that? [00:20] depends on your OS [00:20] Note that paramiko depends on PyCrypto. [00:21] Windows XP [00:21] hm, I thought the bzr windows installer thing included paramiko [00:22] I found a site that says [00:22] pycrypto compiled for Win32 can be downloaded from the HashTar homepage: http://nitace.bsd.uchicago.edu:8080/hashtar [00:22] But the link is dead. [00:23] the links on http://bazaar-vcs.org/WindowsInstall are dead? [00:24] I got the Paramiko binaries from there, but I get the same error. [00:33] seriously. http://ecchi.ca:8000/1.png [00:33] how can I be prevented from removing my own branch? any solution for this? [00:36] you have to get the subscriber to unsubscribe [00:37] mwhudson: As a workaround, or is that intended behaviour? [00:37] more intended than not i think [00:38] O.o [00:38] mwhudson: wtf? :) [00:38] branch watchers can hold branch makers hostages nowadays? [00:40] I installed paramiko on WinXP and I'm getting: Unable to import paramiko (required for sftp support): No module named paramiko [00:41] nekohayo: the only thing that has changed recently is that you can delete branches at all :) [00:41] makes me want to reconsider launchpad as a hosting service :) perhaps I should just dump branches on my apache server [00:42] anyway I guess I'll just change its name and status for now [00:43] well, i doubt SF let's you entirely blow away the history of a project's svn repo [00:43] which is what deleting a branch is like [00:45] Traveler9: you have Python installed, and running bzr from that? [00:45] Yes and yes [00:46] does 'python -c "import paramiko"' work? [00:49] Hm I did that and it said nothing [00:49] But I get the same error on a bzr push [00:49] nekohayo: the intent was to allow the watchers to have time to branch if they are interested before you delete it [00:50] nekohayo: I am beginning to think that it isn't such a good reason [00:50] thumper: hm. perhaps there should be a "it will be deleted in 72 hours" then? [00:50] nekohayo: yeah, that sounds sensible [00:50] Perhaps making the choice to abandon a branch more obvious too. [00:50] Traveler9: so if you execute 'bzr version', does the location of the "Python standard library" match what you expect (ie, is it your Python's lib directory where paramiko is?) [00:52] Python standard library: C:\Program Files\Bazaar\lib\library.zip [00:52] Not sure where paramiko was installed to. [00:53] Traveler9: right - you are running a binary version, not the Python version [00:54] the simplest answer is probably to update your binary version of bzr - can you remember what version of bzr you installed? [00:55] Bazaar (bzr) 1.6b3 [00:55] i finnaly got bzr+bzr-svn, but tests don't pass: http://nopaste.com/p/aPc7fi5uh any tip please? is it a local issue? [00:56] I'm surprised that comes without paramiko === sdboyer|at_work is now known as sdboyer [00:57] I'm putting up a 1.6b4 binary right now that should work :) It will be a few minutes though, and its about 16MB as it has a full copy of Qt4 included (I tried but failed to trim some of that - later!) [01:03] Traveler9: actually, b4 isn't quite ready :) starship.python.net/crew/mhammond/bzr-setup-1.6b3.exe is a slightly different binary version than what you are using - it contains a rudimentary Tortoise and also works fine with Paramiko, if you want to give it a go. b4 will have a much better tortoise, but I'm sure you can survive a few days :) [01:04] Should I uninstall bzr first? [01:07] it shouldn't hurt not too, but it sure can't hurt to uninstall :) [01:07] can bzr log and diff be optimized for huge projects? [01:08] Okay that version gives me: 0.235 failed to instantiate transport for 'sftp://fortw@67.222.133.33/~/': ParamikoNotPresent() [01:09] what does that mean please? "bzr: ERROR: Repository KnitPackRepository('file:///home/jpic/testbzr/.bzr/repository/') is not compatible with repository SvnRepository('file:///home/jpic/testsvn')" [01:10] beuno: replied to your mail [01:10] is_null: it means you have to make different repo when you do init-repo [01:11] bugger. [01:11] is_null, which bzr-svn branch are you using (wrt http://nopaste.com/p/aPc7fi5uh) ? [01:11] bpeterson, i see, i'm trying to track/branch a framework svn repo inside the bazaar repo [01:11] jelmer, 0.4 [01:12] hmm, perhaps I forgot to push some changes [01:13] is_null: the error is caused by your local bzr repository not being a rich-root-pack repository [01:13] see the bzr-svn FAQ [01:13] for testing, i made the bzr repo in ~/testbzr, an svn repo in ~/testsvn (svn wc: ~/testsvn2), i'm trying to get ~/testsvn tracked and branched into ~/testbzr [01:13] jelmer, i just saw the faq, sorry [01:15] the problem is now "AttributeError: 'SvnWorkingTree' object has no attribute '_transport': http://nopaste.com/p/ayvGv2tIb [01:16] * mwhudson lunches [01:16] Traveler9: I'm stumbling around a little in the dark now, but I'm guessing it might be specifically related to sftp. what does "bzr selftest test_sftp" do for you? I get 18 tests run, 1 failure and 3 skips [01:18] 18 tests, 3 skipped, tests failed [01:18] [18/18 in 4s, 1 fail] test_sftp_transport.TestSocketDelay.test_delay [01:21] is_null, I'll have a look, probably broken by some recent change in bzr.dev [01:23] jelmer, what revision are you using? [01:24] bzr.dev 3565 [01:24] bzr-svn 1489 [01:25] thanks! [01:28] same result - strange. i'm fairly sure paramiko us being used in those builds for bzr+ssh pushes. but I haven't tried sftp [01:29] /train :-) :-) [01:29] hi markh [01:29] hi poolie [01:32] Are these bzr-gtk BB confirmations leaking onto the bzr list? [01:34] They seem to be. [01:35] abentley: ^ [01:35] BB uses the branch location to find the project but it doesn't know about all of the aliases for bzr-gtk on launchpad [01:35] if it can't find the submit branch location, it'll default to bzr [01:37] hi [01:38] cjwatson: its in progress on my laptop; haven't finished investigating [01:38] 'morning lifeless [01:38] jelmer: hi, any progress on that bug? [01:38] lifeless, hi [01:38] lifeless, I've merged your rebase branch [01:38] lifeless, Which bug? [01:38] cool [01:39] hi lifeless [01:39] bzr-svn critical thingy [01:39] hi mwhudson [01:39] jelmer: the one discussed in $gnome-bzr [01:39] shoop da woop [01:39] I've literally just got home from the plane, I'll be a bit spotty today [01:40] Bug 250480 [01:40] Launchpad bug 250480 in bzr-svn "Missing texts, ghosts and inconsistent parents" [Critical,New] https://launchpad.net/bugs/250480 [01:43] Is cElementTree needed? [01:43] Traveler9: how you going - i seem to be able to push to sftp fine with those binaries [01:43] Traveler9: its not in those binaries, so I hope not :) [01:44] lifeless, I've been travelling until late yesterday evening so haven't had much time to look at it yet [01:44] jelmer: ok [01:44] me too :) [01:46] Traveler9: is it possibly something in your environment? Is it possible you tried to install paramiko into the "\program files\bazaar" directory? [01:46] It was installed to the default, I didn't change anything. [01:47] your python install should not be used at all when using the binaries. Theoretically they couldn't possibly conflict, but theory and practice... [01:48] I'm getting this now: bzr: ERROR: exceptions.NameError: global name 'win32ui' is not defined [01:49] why isn't bin/bzr compiled? [01:49] to what? it is python code. [01:50] bytecompiled? [01:50] Traveler9: ack, that is in paramiko. You getting that running "python bzr", or bzr.exe? [01:50] cmd.exe /K start_bzr.bat [01:50] bob2, yes [01:51] is_null, how did you get the _transport error? [01:51] is_null: it is like 80 lines of code :) [01:51] jelmer, sorry, i did not make the investigation log [01:52] is_null, I've just pushed some fixes to the 0.4 branch [01:52] any chance you can try again? [01:53] bob2, i'd like to set different pax flags on bzr, i tryed to bytecompile it by running `python -O bzr` as in section 6.1.3 of http://docs.python.org/tut/node8.html but it did not create the bytecompiled file and i'm a newbie with python ... any tip please? [01:53] jelmer, sure [01:53] (note that i was probably mis-using bzr-svn) [01:53] is_null, that's alright, it shouldn't yell at you if you do that [01:53] Traveler9: I'm not sure how that happened- I might need to check the paramiko binary - but it looks like you will need to edit paramiko\win_pageant.py :( [01:54] is_null: I don't think that will help, 'python' will still be the executable [01:54] the paramiko trunk doesn't have that error [01:54] jelmer, can't reproduce, sorry [01:55] I'm not sure how to go about doing that. [01:55] bob2, true ... i was confused [01:59] The problem isn't simply "paramiko is missing" - if it is, the error looks more along the lines of "bzr: ERROR: Unsupported protocol for url "sftp:... No module named paramiko" [02:01] Do you want the entire backtrace? [02:02] not of the NameError - I'm more interested in your original error from the binary "failed to instantiate transport for 'sftp://fortw@67.222.133.33/~/': ParamikoNotPresent()" and why that is failing to find paramiko [02:03] Well right now it's giving me the NameError [02:04] oh - you mean start_bzr.bat from the "\program files\bazaar" directory? Yeah, please include the 2 lines above the one you show [02:05] 2 lines above "global name 'win32ui' is not defined"? [02:09] yeah [02:09] >bzr push --create-prefix sftp://fortw@68.222.133.33/ [02:09] Connected (version 2.0, client OpenSSH_4.3) [02:09] bzr: ERROR: exceptions.NameError: global name 'win32ui' is not defined [02:13] lifeless, just posted a comment; I can't reproduce it [02:15] that is looking very much like an error I made making those binaries :( I'll try and have a fixed one in an hour - hopefully less. [02:26] jelmer, i've got a segfault with bzr-svn: http://nopaste.com/p/aRwQLnxlk what bzr-dev revision for the current head of bzr-svn please? [02:27] the latest bzr.dev should work with the latest of bzr-svn [02:29] still segfaulting ... [02:31] is_null, that sequence of commands works fine here [02:31] what version of python are you using? [02:33] and what hardware platform? [02:34] jelmer, amd64, python 2.5.2 [02:35] is_null: The bzr-svn testsuite doesn't segfault? [02:35] spiv: http://svn.gnome.org/tmp/common-pre-commit [02:35] spiv: gnome common hook sources [02:37] jam: ping [02:37] jelmer, http://nopaste.com/p/a2J5Ni7Jm [02:37] jam: is there a canned way to disable lazy imports? [02:37] is_null, can you try "make check-one" ? [02:38] (or bzr selftest svn --one) [02:39] jelmer: debugging the segfault I get ? ::) [02:39] lifeless: thanks, but I already have a copy of that. [02:39] spiv: cool [02:39] spiv: I was closing browser windows [02:39] Ah, right. [02:39] lifeless, I think it's a different one - he's getting unexplainable errors in the testsuite as well [02:40] jelmer, http://nopaste.com/p/adjtVmRUI [02:40] jelmer: the test suite that segfaults for me ? :) [02:40] jelmer: python 2.5.2 amd64 [02:40] lifeless: Do you get testsuite errors before the segfault? [02:40] is_null, what version of subversion are you using? [02:40] jelmer, 1.5.0 [02:40] jelmer: svn, version 1.4.6 (r28521) [02:41] jelmer: running make check [02:41] jelmer: fail - doesn't honour PYTHONPATH [02:42] it seems to do so here: http://nopaste.com/p/aaI6uBvZQ [02:42] lifeless, I'm pretty sure it does - you may need to set $BZR though [02:43] which bzr gets the right bzr [02:43] I was wondering if there was a place somewhere that listed the strings you couldn't pass into the --message option of bzr log [02:43] jelmer: no errors just hte segfault [02:44] currently I know of bzr log --message=* --message=? --message=+ [02:44] Traveler9: http://starship.python.net/crew/mhammond/bzr-setup-1.6b4-mh1.exe will hopefully work better for you. [02:44] libwilliam: surely that is a limitation of your shell, rather than bzr [02:44] libwilliam: it wants a regex [02:44] libwilliam: so "bzr log -m='.*'" will work fine [02:45] (for instance) [02:45] libwilliam: eep, sorry, read 'commit' rather than 'log' [02:45] lifeless, well I am doing the Anjuta plugin, and I have an entry where someone types in a regex and I update on the go... I just don't want it crashing if the first char they type is * [02:46] currently I can handle ignoring a first char of * + or ? but I wasn't sure if that was all of them. [02:46] libwilliam: if you're doing that sort of search, I would suggest using bzr-search instead [02:46] libwilliam: but separately - nothing should cause bzr log -m to actually crash; if you see crashes please file a bug [02:46] ok [02:46] ill make sure and submit a bug [02:46] it just won't find anything useful if its not a valid regex [02:47] (bzr-search will be stupidly faster than log -m for long lived projects) [02:47] Okay [02:47] k, stupidly fast sounds good :) [02:47] it doesn't suport regexes or stemming or anything yet [02:48] is_null, checking what could cause this.. [02:48] just simply boolean AND with literal matches [02:49] jelmer, wait, something is actually eating all my RAM and i can't figure the process [02:49] unfortunately I need xml output, I am using the xml plugin... but I think something like that is in the works [02:49] there is xml plugin support for search [02:49] bzr: ERROR: exceptions.NameError: global name 'win32ui' is not defined [02:50] bzr-xmloutput has search support? [02:51] libwilliam: Verterok: knows the details, but there is a bzr-eclipse that has search support [02:51] and it uses the xml stuff too [02:51] is_null, any chance you can try again with the latest revision in the 0.4 branch? [02:51] libwilliam: Surely you can validate whether a string is a regex before passing it through to bzr? [02:52] Or just re.escape the search string. [02:52] spiv: kindof prevents them using a re ;) [02:53] Ya Vertorok mentioned he was working on doing something with search in his plugin [02:54] lifeless: well, depends on what they want :) [02:54] For the mean time I will check if it is a regex beforehand... and I'll submit a bug on the bzr crash with an invalid regex [02:54] libwilliam: the search is in the xmlrpc plugin I think. [02:54] libwilliam: or the rpc branch of xmloutput [02:54] I dunno the details :) [02:55] all I know is I have eclipse here that does bzr-search integration [02:55] thats the one I have checked out :) so i'll browse the code and see how to use it [02:55] jelmer, http://nopaste.com/p/aTshZ4A9y btw, see at the end that there is >2G of free RAM, and it still exits "out of memory" [02:56] thanks! [02:57] libwilliam: hi [02:57] Verterok: hey [02:58] lifeless: the xmlrpc service in xmloutput now support bzr-search ;) [02:58] is_null, I suspect this is some 64-bit-related issue [02:58] Nice :) [02:59] lifeless: I don't have a canned way to do so, but in the 'bzr' script you could do override the lazy_import function. You could even just use the same ImportProcessor with a different lazy_import_class that just automatically imported them into scope. [02:59] That said, I know that bzrlib won't import anymore because of cyclical dependencies [02:59] libwilliam: the support is only for the xmlrpc bit, it uses xmlrpc de/serialization to send the results to the client (a simple dict) [03:00] jam: damn [03:00] Alright, the xmlrpc thing I am going to look into after I get most of the stuff working by itself, which is close. [03:00] When you explained it it didn't seem so tricky [03:00] mwhudson: how did you make pyflakes/pydocktor work with lazy import? [03:01] lifeless: i only did pyflakesw [03:01] libwilliam: but I think that writting a xmlsearch command should be quite easy :) [03:01] mwhudson: ... and how? [03:02] libwilliam: be aware that I don't have a clue about how to write a xmlrpc client in C :) [03:02] lifeless: https://code.edge.launchpad.net/~mwhudson/pyflakes/support-lazy-imports [03:02] lifeless: by compiling the string that gets passed into lazy_import into an ast and processing that just like the rest of the ast [03:02] Verterok: you just avoided a question in a couple weeks ;) [03:03] blergh [03:03] heh :) [03:03] jelmer, well thanks for your help anyway, i know that you can't do anything about it... too bad i couldn't get my stuff done after all that hours trying (hopefully i'm a newbie and used to it) [03:03] jam: I want to try our freeze [03:03] its been on my list for $too_long [03:03] freeze? [03:03] jam: do you think the cyclical imports are easy to resolve? [03:03] lifeless: It would just be delaying them to some later time [03:04] jam: py2exe for linux. ish. [03:04] is_null, Things should hopefully be a bit easier to deal with once the new versions of bzr and bzr-svn are out [03:04] jelmer, what do you mean? [03:04] Question: What is the proper command for uploading a branch to the launchpad? I'm rather confused as if i "register a branch" (Trunk for example), the resulting branch is "located at ~myname/hcrf/trunk", which seems odd to me to tie a project branch to my name [03:04] is_null, well, since you can't use the current release because of some bugs that have since been fixed [03:05] I assume your distro packages bzr and bzr-svn? [03:05] I'm coming from Git, but this is obviously foreign heh [03:05] Leefmc: well, if you want a project branch that many people can upload to, create a team [03:06] Leefmc: branches in launchpad are in a namespace - owner/project/name [03:06] lifeless: the other 'quick hack' to do it is to just comment out the "lazy_import(globals(), """ line [03:06] lifeless: I have to create a team "first"? At the moment i dont have a team, nor do i want one, but later it will be desired. [03:06] Leefmc: this lets anyone call their branch anything they want [03:06] lifeless: Ah, ok [03:06] I intentionally made the syntax == regular import [03:06] Leefmc: you can create a team later and hand the branch over to the team [03:06] lifeless: I just found it odd since my project is launchpad.net/myproj [03:06] jelmer, i'm using bzr.dev and the 0.4 branch of bzr-svn ... [03:06] so I think you could do: [03:06] is_null, yeah, but the 0.4 branch is rather unpolished [03:07] lazy_import = lambda scope,text: eval text in scope [03:07] or something to that effect [03:07] is_null, in particular, this 64-bit issue exists at the moment but that should be fixed before the release [03:07] It doesn't exist in 0.4.10 [03:08] jelmer: do you have access to a 64 bit cpu? [03:08] is_null: you could run under gdb [03:08] lifeless, can't (aslr) [03:08] lifeless, no, but I'm installing debian on a 64-bit qemu image atm [03:08] jelmer: let me know if you can't reproduce [03:10] No matter how many times I hear that, it still doesn't sound right. [03:11] ToyKeeper, ? [03:12] hehe [03:13] I think he was referring to "let me know if you can't reproduce" [03:13] lol [03:13] Which might be something you'd get referred to a fertility specialist for. [03:13] Question: Does launchpad code give you the ability to view source code? (Ie, web based source, with highlighting, etc?) [03:13] I had never thought of interpreting it that way [03:14] Takes a strange mind... [03:14] Leefmc: http://bazaar.launchpad.net/USER/PROJECT/BRANCH [03:14] * ToyKeeper spent much of the past 2 years trying not to laugh during QA meetings because of that particular language quirk [03:15] Leefmc: you can browse source, he's an example of a file in a branch: http://bazaar.launchpad.net/~bzr/bzr/trunk/annotate/head:/README [03:15] Leefmc: e.g. http://bazaar.launchpad.net/~lifeless/+junk/bzr-index2 [03:16] ah k ty. I was wondering because it seems i have uploaded my project, but i have yet to find where i can browse the source, etc. [03:16] Leefmc: it doesn't do syntax highlighting of files yet, though. [03:16] no biggie [03:16] There's a "Browse code" link on the branch page. [03:17] (Assuming that the branch has revisions in it, anyway) [03:18] yea [03:19] So what is the proper pushing command then? The tutorial shows bzr push bzr+ssh, but the launchpad pages show bzr push lp: [03:19] Though i've gotten errors everytime with lp [03:20] Leefmc: Did you 'bzr launchpad-login myname' first? [03:20] No, i get an error with that [03:20] Either is fine, the "lp:" one is just a shortcut. If you get errors with it, it's likely because you haven't run "bzr launchpad-login YOURNAME" first. [03:20] You need to give it your username, and set up ssh keys, before you can push to launchpad. [03:20] Note that the tutorial never talked about the lp one, nor launchpad-login [03:20] ToyKeeper: Yea but i can't do that heh,it just gives errors :/ [03:21] 1 sec, i'll get the error [03:21] This is part of it: .... is permanently redirected to https://launchpad.net/~... [03:22] Full: bzr: ERROR: https://launchpad.net/%7ELeefmc/%2Bsshkeys is permanently redirected to https://launchpad.net/~leefmc/+sshkeys [03:22] enter that URL in your web browser to paste your id_rsa.pub in [03:23] How can I retrospectively add --no-trees to a shared repository? [03:23] Leefmc: https://launchpad.net/~leefmc/+sshkeys is not a URL for a bzr branch [03:23] pickscrape: touch .bzr/repository/no-working-trees [03:23] pickscrape: (sorry) [03:23] lifeless: excellent, thanks [03:24] Worked like a charm :) [03:24] sounds like something "bzr reconfigure" should let you do [03:24] indeed [03:25] Leefmc: also, there doesn't appear to be a 'leefmc' user in Launchpad, although I do see a 'leefmc+0layvar'. [03:25] mwhudson: pyflakes uses the python parser? [03:26] lifeless: it uses the compiler package [03:26] (which uses the parser module, which uses the python parser) [03:28] spiv: About the url, i dont know about that. All i know is i type "bzr launchpad-login Leefmc" and it gives me that error. Also, i assumed it wanted my display name because it roughly accepts "Leefmc", but if i type "leefmc" it returns a "no leefmc user" error [03:28] I'll try my full name [03:28] It wants your launchpad user ID. [03:28] holy cow [03:29] spiv: So which command should i use for pushes then? As i mentioned the tutorial gives one example, the project pages give another [03:29] Leefmc: that error is pretty bad, it seems to be a bug in the launchpad-login command. [03:30] spiv: Gotcha, i changed my "name" to leefmc anyways, and now it worked :) [03:30] Leefmc: either is fine, but "lp:" requires that you've done a successful "bzr launchpad-login ..." first. [03:30] Leefmc: the lp: essentially just redirects to the bzr+ssh:// location [03:30] spiv: Either is fine, but one isn't optimal over the other? [03:30] Ah ok, gotcha :) [03:30] But is obviously much shorter to type. [03:31] lifeless: if you are just looking to use something like py2exe, our setup.py code already has something to hack in understanding of lazy_import for py2exe [03:31] you might just grab that [03:31] jam: freeze generates C modules [03:31] ah [03:31] interesting [03:32] /usr/share/doc/python2.5/examples/Tools/freeze [03:32] with the bytecode in an array. [03:32] fugly stuff :) [03:33] * ToyKeeper wonders why bzr remembers the expanded URL instead of the one the user entered [03:35] do people still use freeze? [03:37] jamesh: I want to see what it does to startup time [03:38] lifeless: I'd have thought that zip imports would give similar performance [03:38] jamesh: depends where the slowdown really is [03:43] * igc lunch [03:57] There doesn't seem to be a link section for a project dev blog, am i correct? (Ie, to tell users of the project dev blogs location) [03:58] markh: does py2exe work on linux? [03:59] Leefmc: don't think there is no; #launchpad is the IRC channel for launchpad specific questions BTW [03:59] lifeless: Thanks for the heads up [03:59] lifeless: not afaik [03:59] (though we'll try to answer here, the actual lp devs are better represented on #launchpad) [03:59] I believe it can run on linux, but not create executables that target linux [04:02] there is py2app for macosx - and pyinstaller is a revival of a dead project, and it says it works on linux - http://pyinstaller.python-hosting.com/ - but I'm not sure how active that is [04:02] How do you save a location to bazaar? [04:02] Mine has an invalid location saved (for pushing) [04:03] "bzr push --remember kajshdfklajsh" will overwrite the existing value [04:03] Leefmc: --remember [04:03] thanks [04:03] markh: yah, I want a monolithic binary, not an installer. === mw is now known as mw|out [04:06] need sleep, back in a few [04:06] hours that is [04:06] Question: So, just to get my bearings, in Git i would often try out code ideas by creating a separate branch and toying with code. And ofcourse at anytime you can switch pop back and forth between the two branches. How is this done in bzr? [04:07] bzr branch seems to talk about separate directories and junk [04:07] so i assume that is not what i want [04:07] what you probably want is: [04:08] bzr init-repo --no-trees REPO [04:08] bzr init REPO/trunk [04:08] bzr checkout --lightweight REPO/trunk WORKING [04:08] cd WORKING [04:08] * Leefmc is confused :) [04:08] So wait [04:08] cp -r /source_I_want [04:08] bzr add [04:08] bzr commit -m 'imported' [04:08] your cd'ing, so is the git workflow not possible in bzr? [04:08] bzr branch $REPO/trunk $REPO/branch [04:08] bzr switch branch [04:09] bzr switch trunk [04:09] etc [04:09] Leefmc: its totally possible, we have separate concepts for 'source you edit', 'branch', and 'history storage' [04:09] it just looks a tiny bit different than in git [04:10] Well i mean, your cding.. so your storing your branches as copies, correct? [04:10] Thats not exactly what i was looking for [04:10] what my commands above setup is one tree to edit your source, N branches, and one repository to store your history [04:10] Leefmc: I don't know what you mean by 'as copies'. Each branch is a few KB of data [04:10] those tools all try to get as close to a monolithic installer as possible iiuc [04:11] lifeless: Copies as in, say all your code is in "/src", are you storing "/src" and "/test-branch" ? [04:11] pyinstaller's history is that it was proving better than py2exe, but then the maintainer vanished, so most people jumped back to py2exe - then it was revived as pyinstaller. [04:12] Leefmc: I don't follow the question [04:12] lifeless: Ie, in git (and this is the main point im driving at) all your code is stored under "/src" and git modifies your source depending on the branch your in [04:12] lifeless: So you can have ten branches, but you only have one directory for your source [04:12] lifeless: And switching between those branches does nothing but change the contents of "/src" [04:12] lifeless: But git manages that, not me. No cding, etc [04:13] Leefmc: so there are two separate things here: having N directories, and 'switch does nothing but change the contents of "/src"' [04:13] Leefmc: in bzr (without plugins) a branch is always a directory, so that you can use normal tools to manage it [04:13] lifeless: Gotcha [04:13] Leefmc: but your *source code* is able to be decoupled from the *branch* [04:14] Leefmc: and that gives you 'switch does nothing but change the contents of "/src"' [04:16] Leefmc: e.g. if you have two branches of mysql with only a couple of files different, 'bzr switch' will only write to those two files, and the metadata files during the update [04:16]