[00:00] lifeless: Thanks [00:00] lifeless, hopefully I'll be able to find some time next month to transform bzr-rebase into bzr-rewrite [00:06] jelmer: I'm trying to build a universal (ppc & i386) static svn in order to ship it with bzr-svn [00:08] jelmer: I'm failing to build it as universal, but I think it's a matter of configure it with the right flags, atm I'm trying to build apr as universal, as it seems the svn iself works ok [00:13] spiv: success: [00:14] raw_record_map = self.vf._get_record_map_unparsed(keys, allow_missing=True) [00:14] record_map = self.vf._raw_map_to_record_map(raw_record_map) [00:14] spiv: if we serialise raw_record_map, a dict of simple types, we can resume this function on the other side . [00:14] spiv: 'yay' [00:15] -> appointment [00:15] lifeless: :) [00:46] I'm wondering what the best way is to do SVN style keyword substitution is in bzr? [00:47] I would like to replace $Date$ and $Rev$ in my files in a certain project (repo/branch) [00:48] eferraiuolo: there was a thread about that on the mailing list recently [00:48] I think igc is looking at writing code to do that? [00:48] igc: ^ [00:49] oh alright; so I shouldn't expect it to be baked into bzr right now then? [00:51] You can get the same sort of effect semi-automatically, ish. [00:55] eferraiuolo: 'bzr help version-info' will give you something a (very) little bit like what you want. [00:57] So do you put things like {date} in your source code then run the command? [00:58] eferraiuolo: see https://launchpad.net/bzr-keywords [00:59] eferraiuolo: the main sticking point is that bzr.dev doesn't supporting content filtering yet - a patch is up for review for that [01:00] not sure I totally get the workflow with bzr version-info [01:01] eferraiuolo: What you'd have to do is stick {date} in your source code, and then filter it through sed with the output of version-info (urgh). [01:02] gnome-do uses version-info in the buildsystem, to define a nice, complete version string with revno and branch nick and such. It works well for that. [01:04] eferraiuolo: a cleaner way to use version-info tends to be to have a command to use it to generate a single, small source code file with the values in it. e.g. a header file for C with a #define. [01:05] eferraiuolo: and then have the rest of your project reference that file, and have your makefile regenerate it when appropriate. [01:05] yeah, although I'm looking at doing this in a JavaScript file [01:06] Ah. That does sound awkward :) [01:07] :-) It's mainly to help people keep track of what revision my small JS file is in so they know if the one they are using is old or not [01:07] so I just wanted it in the comment block at the top of the file [01:07] * spiv nods [01:57] * igc lunch [02:07] what's the default merge algorithm these days? [02:10] jml, i think it's lca [02:12] I just had an interesting conflict experience where I removed a large chunk of code in one branch, and the branch I merged in had removed adjacent but independent large chunks of code. [02:12] reading the herringbones was a little tricky at first. the solution (under a weave merge) was just to delete everything inside conflict markers [02:17] i think the default is still merge3 actually [02:17] as i've done bzr remerge --show-base and not had it complain at me [02:42] how do you sever the connection between bzr-svn checkout brach from svn? I want to switch to "mirroring" setupd. [02:48] baxissimo: I'd guess that you'd do that with 'bzr unbind', assuming bzr-svn works as I'd expect. === arjenAU2 is now known as arjenAU [03:03] RAOF: "convert the current checkout into a regular branch" -- That sounds like that should do it! [03:03] What kind of non-regular branches are there? [03:04] Just checkouts and branches? Is that the distinction? [03:04] Pretty much, yes. [03:05] And big difference with a checkout is that bzr ci actually pushes to the remote repo automatically? [03:06] (Looking into bzr after a while using hg...) [03:07] baxissimo: yes, checkouts behave like svn checkouts, branches behave like, well, branches [03:17] Hmm, "bzr bind" on the bzr-svn tree says "No location supplied and no previous location known" [03:17] baxissimo: you can supply a url [03:17] baxissimo: this is the one oddity - you can turn a brnach into a checkout by doing 'bzr bind URL' [03:17] ) [03:17] :) [03:19] What I mean is that RAOF said bzr-svn was like a checkout, but unlike a checkout "bzr bind" doesn't report the currently bound location (the SVN tree). [03:21] bzr-svn, in my experience, basically makes bzr treat svn URLs the equivalent of bzr branches. So you can 'bzr checkout svn://wherever', and get a checkout, or you can 'bzr branch svn://wherever' to get a branch. [03:21] Anyway, what I really wanted to know was how to determine if a given source tree is a branch or checkout. [03:22] 'bzr info' will probably get you that. [03:22] I thought "bzr bind" with no arg would give that, but maybe not. [03:23] Beautiful. Thanks. Ok, and "bzr bind" apparently will rebind to the previously bound location. "bzr unbind && bzr bind" seems to get me back where I started. [03:28] lifeless: see line 145 in http://bazaar.launchpad.net/~bzr/bzr-usertest/trunk/annotate/head%3A/scripts/script_common.py [03:29] lifeless: also log -v takes days/hours for large repos so I don't include a benchmark for it yet. I will soon [03:37] igc: is that a 'tree only' answer? [03:40] I had one more newbie question -- hg folks recommend NOT setting up repos SVN style with lots of separate projects all together under one common top directory. How about bzr? [03:41] I think with Hg the problem is that there's no way to check out just a single directory of a repository, so you end up having to pull everything in just to get that one dir. [03:41] Is Bzr the same in that respect? [03:41] bzr doesn't conflate branches and repositories [03:42] also repositories are just storage optimisations for bzr [03:43] so "no" [03:43] So can "bzr branch" make a branch of just a particular directory of a remote repository? [03:43] sure [03:43] with bzr, repository = box of branches sharing a common revision store [03:43] Ok, but I want the offline check-in goodness, too. [03:44] the only downside is that operations modifying revision data will lock the whole repository (I think) [03:44] that is unrelated [03:44] Ok. [03:46] So what would be the command to get a branch of just the bar directory of the foo repository? [03:46] lifeless: yes [03:48] bzr branch bar/foo [03:49] foo foo/bar, obviously [03:49] holy crap [03:49] bzr branch foo/bar [03:49] bob2: that tells me ERROR: Not a branch: "........foo/bar" [03:51] are you sure you're clear on what a branch is? [03:51] bob2: but just "bzr branch foo" works. [03:51] you can't "branch" a subdirectory of a branch [03:51] bob2: not entirely sure what it means in bzr-o world, no. [03:51] then foo is a branch, not a repository [03:52] bob2: Ah, ok. So they're different with bzr. I sort of see what you mean about bzr not conflating the two concepts. [03:52] bar is just a subdirectory in a branch, and you can't checkout (or branch) just that bit (no dvcs I've heard of can) [03:53] Ok. [03:54] You can do it with SVN, so SVN repos tend to have lots of only loosely related stuff in them. Like 'baxissimo-repo". [03:54] if hg works differently, it is pretty unique among version control systems [03:54] svn is just a versioned filesystem [03:54] it doesn't really have branches [03:54] james_w: So, profiles did not make the cut outstanding merges on bzr-bd? Do you still see it as nessicary and/or useful? [03:54] except by convention [03:54] No hg can't do it, svn can. [03:55] Those are the two vcs's I know best. So I wanted to know what about bzr. [03:55] I was refering to hg's idea of a "repository" [03:56] I'm about to convert a big svn repo to bzr, and I want to know if I should try to split it up into separate bzr repos ... er "branches" I guess I mean. [03:56] bob2: hg doesn't work differently [03:56] baxissimo: 'bzr-svn' can split it up into different branches for you [03:56] baxissimo: in fact,it tries quite hard to guess correctly. The easiest way to find out is 'bzr branch svn://foo/bar' [03:57] lifeless: ah [03:59] lifeless: easiest way to find out what? What it actually did? I used TortoiseBzr to make the svn->bzr checkout. It looks like it put everything in one big branch. [03:59] By that I mean there's only one .bzr file at the top. [04:00] baxissimo: if you did a checkout, then yes. As a special case though, bzr-svn considers a checkout of a whole svn repo different to checking out one branch within a svn repo [04:00] baxissimo: so did you checkout the root of your svn repo, or a subdir? [04:00] I checked out the root. [04:01] So I should do dir-by-dir checkouts instead? [04:01] baxissimo: yes [04:01] baxissimo: also, there is a command 'bzr svn-import' that will convert the entire repo for you in one hit [04:01] I doubt that tortoise exposes that, but you might like to give it a go [04:02] jelmer: that special case ^ seems to confuse people regularly, can we make it more inaccessible or something, so it only works when its really the right thing to do? [04:02] lifeless, it's not a special case [04:03] lifeless, at the moment bzr-svn will warn if it thinks you should not be checking out the root [04:03] lifeless: Looks like it does not expose it. So svn-import will split things up automatically? [04:04] baxissimo, did you see such a warning? [04:05] lifeless: or do I need --standalone? [04:05] baxissimo, yeah, it will split up automatically, no need for --standalone [04:06] jelmer: ugh, ok here goes another 3 hr checkout/conversion process [04:07] baxissimo, what bzr-svn are you running? Newer versions should be significantly faster [04:07] baxissimo, also, did you see a warning about checking out the repository root when you ran "bzr checkout" originally? [04:07] 1.11 seems to be the newest installer version for windows [04:07] No saw no warnings, but maybe tbzr just didn't pass them along? [04:08] baxissimo, ah, that could indeed be what's happening [04:08] I have to pull 1116 revs from france to tokyo, so it may not be bzr's fault here :-) [04:09] I think the 1.11 installer still has an older bzr-svn, but still one that does have the warning [04:11] Anyway, it is time for lunch over here, so I'll just let svn-import chew, while I go do some chewing of my own. [04:12] Thanks for the help jelmer, bob2, lifeless and RAOF. [04:29] jelmer: will you see a warning from the gui? [04:29] lifeless, I don't know what tortoisebzr/qbzr do, bzr-svn just calls trace.warning [04:30] jelmer: I suspect nothing :) [04:30] I suspect you suspect right [04:30] jelmer: if its not on bzrlib.ui.ui_factory, I'd expect everything to disappear [04:33] lifeless, so, the alternative is to just flat out refuse checkouts from the root if that doesn't match the layout (as set by the user or guessed) [04:34] lifeless, I'm divided as to what is the right thing to do here [04:34] some users seem to actually *want* to check out the root, but the current behaviour also allows others to shoot themselves in the foot [04:44] jelmer: I agree its difficult [04:58] poolie: I have made a minor edit, I'm not sure i'm finished, but there is plenty there [06:28] is it just me or does 1.12rc1 not give progress bars on windows? [06:30] jelmer: sup? [06:32] jelmer: after my exams i'll tackle compiling python down to c a bit using annotations + inference, i hope i'll be able to apply that to dulwich [06:39] poolie: I have made a minor edit, I'm not sure i'm finished, but there is plenty there [06:57] lifeless: i hope you haven't been doing that since lunchtime? [07:01] poolie: oh no, [07:01] poolie: you d/c'd when I went to tell you before [07:01] 15:55 < lifeless> poolie: I have made a minor edit, I'm not sure i'm finished, but there is plenty there [07:01] 15:56 -!- poolie [n=mbp@ppp112-44.static.internode.on.net] has quit [Read error: 60 (Operation timed out)] [07:02] poolie: I have just sent in a [MERGE] for byte-encoding for record streams [07:02] poolie: which means that tomorrow spiv and I will be glueing the various bits together, we should have a wart-free push working to stacked branches, without the ucky upcast to full texts used previously [07:03] lifeless: why are tags bencoded? [07:03] poolie: however, I'm well past 'done time' :) so sayonara, and chat to you tomorrow [07:04] ronny: I don't know [07:04] lifeless: also, are there things like signed tags? (git has those as objects) [07:05] ronny: sorry, I need to head off, hopefully someoneelse can chat :) [07:05] ciao [07:06] cu [07:17] hi all [07:48] hi guys I am just checking out bzr and I am a newbie... [07:49] I have gone ahead and done the steps to reach my "initial import" and now I am wondering how I can proceed by keeping a good working copy and working on another copy that I will add features to? [07:49] Any suggestions as to how I should be doing this? [07:52] You should read the documentation. [07:55] Peng: I am [07:55] its a bit convoluted [07:56] I am used to CVS and then SVN's trunk/branch model [07:56] just wondering how I can achieve the same using bzr [07:56] Hi; [07:56] I have a basic BZR question. Can I ask it here? [07:56] after the initial import do I just start working on the "working copy"? [07:56] or should I create a different "dev" branch and work on that ... then merge the branch to the main branch? [07:57] Peng: any suggestions? [07:57] I peng: it seems like you are trying to do something similar to me. You should have two branches [07:58] One that is the main one, and then your personal one where you do your work. [07:58] (Or maybe two branches, if they are totally different areas that you are working) [07:58] Then, when you are satisfied with something, you push it to the main one. [07:58] I guess that is for CBro2007, sorry. [07:59] keithcu: yes [08:00] That is what I am trying to setup. Unfortunately, the docs I see don't give such clear help in the context of launchpad [08:00] keithcu: my understanding is that maybe I don't need to start a NEW branch and I can just use the working dir [08:00] Some people like to use the main branch for simple things, and separate branches for mroe complicated stuff. [08:00] aha [08:00] that is the concept [08:00] Yes, if it is just you, you can party in one branch [08:00] so when I reach a major milestone I commit my changes to the MAIN branch (or trunk) [08:01] and then I should in theory be able to start up a new branch yeah? [08:01] I have done the initial import... now how do I create a new branch from this? [08:02] CBro2007: "bzr branch" [08:03] bzr: ERROR: command 'branch' requires argument FROM_LOCATION [08:04] how do I view a list of my branches? [08:04] CBro2007: "bzr branch path/to/your/branch some_new_path" [08:04] it tells me how I can branch from a PUBLISHED branch [08:04] * Peng_ points to the documentation [08:04] CBro2007: You can branch from any branch. [08:05] so how do I branch a copy from my Original Import? [08:05] and when do I "publish" a branch? Is this done so other people on the project can COPY this branch and work on it? [08:06] CBro2007: Yes. [08:06] k [08:07] I have a question: I have setup two branches: https://code.launchpad.net/openracing [08:08] My keithcu work branch is fine, but now I'm trying to push these changes to trunk. [08:08] ok managed to create a new branch from my existing initial import [08:09] I don't know how to do that. [08:09] I tried bzr init, bzr merge ../work, bzr push lp:openracing, but that didn't work [08:10] you want to know how to branch from the initial import? [08:10] ? [08:10] keithcu: 1.) What's the point of merging into an empty branch? Heck, you can use pull then, 2.) You need commit after merging [08:10] keithcu: Did you want "bzr branch"? [08:11] keithcu: is that what you wanted? [08:11] I just wanted to push my changes to trunk. I have my work directory branch and that is it! [08:11] keithcu: "bzr push", then? [08:12] Peng_: How do I look at a list of branches ? [08:12] Okay, so I go to my work directory, and when I type: bzr push lp:openracing [08:12] keithcu: if you have done the initial import and want to create a branch off that initial import --> "bzr branch . something.dev" [08:12] it tells me that the target directory already exists, but does not have a valid .bzr file [08:13] CBro2007: Unlike git, there's only one branch per directory, so you can just use ls... [08:13] CBro2007: The bzrtools plugin adds a "bzr branches" command if you really want it. [08:14] so u saying that I cannot have more than one branch in this directory? [08:14] CBro2007: You cannot. Fortunately, most file systems support having multiple directories. :P [08:15] mmm [08:15] I haven't done any import. I just have my work branch and I'm trying to setup a connection to setup a connection to trunk and pull to it, but I don't know how to do that. [08:15] and push to it [08:15] so if I navigate to my .dev branch... that would be the files that I should be working on? [08:16] CBro2007: Sure? You might want to use multiple branches, or you might not. [08:17] Peng_: At the moment I just want to test out the simple case where I can branch a new dev copy ... work on it.. be able to revert changes if I screw up, commit to a branch and then finally merge it to my main branch [08:17] Okay. [08:18] so let me get this right [08:18] I just created a branch called "something.dev" [08:18] I navigate to that directory and work on the copy there [08:18] You can do that. [08:18] and then I should be able to issue commands like "bzr status" etc in that dir [08:19] Peng_: what other way is there? [08:19] There are 1 million ways to work with bzr [08:19] how do I start to work on the branch I just created and only be constrained to this branch? [08:19] thats the problem! :) [08:19] I just need one... not a million.. [08:19] maybe the solo case for now [08:19] How many people are you working wiht? [08:20] two more [08:20] so the trunk branch model would suffice [08:20] Okay, so you create your work branch (and they create their work branch) [08:20] Once I am comfy with this whole branching stuff I will publish the branch on launchpad for the rest (atleast that is the plan) [08:20] And then when any of you are satisfied, you push your changes to the trunk branch [08:20] yep! [08:21] or they send their changes to me first and I commit it to the main trunk [08:21] Yes, that is doable too. [08:21] My problem is that I don't know how to setup the trunk branch [08:21] I have one: [08:21] CBro2007: Send how? Patch files? [08:22] isn't there a way they can do a "bzr send" or something [08:22] or maybe they can send me their branch [08:22] and I can merge it from my end [08:22] possible? [08:23] CBro2007: "bzr help send" :D [08:23] you love pointing out the documentation don't ya? [08:23] you might as well give us some pointers mate! :) [08:24] The people who wrote the documentation are better writers than me. :P [08:24] Well, how do you setup the trunk branch? [08:24] I set one up: https://code.launchpad.net/~openracing/openracing/main [08:24] but I can't push to it. [08:24] keithcu: Honestly, I'm not sure. Try "bzr push --use-existing-dir" [08:25] CBro2007: You can use "bzr send -o foo.patch" to create a patch-like file that also preserves the history, then "bzr merge path/to/foo.patch" in another branch. [08:25] CBro2007: "bzr send" can also help you send an email with the file attached; see the edocs. [08:25] Err, docs* [08:26] Okay, I'm trying that and overriding the warning. [08:27] It seemed to work... [08:27] that seemed to kill my work branch! grr [08:28] oh well, I'll figure it out another time. [08:28] I am sure they could have made it easier :) [08:28] wish someone wrote a cool GUI tool that fronted all this backend stuff [08:29] I just wish there were docs specifically walking through the basic launchpad setup. [08:29] keithcu: you want something like [08:29] I've read all I can find, but it wasn't enough. Some of it was clearly written before it was integrated into launchpad [08:29] bzr push bzr+ssh://bazaar.launchpad.net/~openracing/openracing/main [08:31] I was doing bzr push lp:openracing [08:31] poolie: so i just created a new branch.... does this mean I can navigate to this branch and start modifying the contents? [08:31] CBro2007: yes [08:32] poolie: would this mean that I am contraining the changes to this branch only? [08:32] keithcu: ok [08:32] keithcu: do you have to publish your changes? [08:32] CBro2007, it works better when you have a basic question to ask rather than a long series of them [08:33] yeah thanks :) [08:33] keithcu: Oh, did you ever run "bzr launchpad-login your_username"? [08:33] bazaar does raise a LOT OF QUESTIONS [08:33] we have lots of answers too [08:33] yep [08:34] I think I've hosed my stuff. It shows 2 branches, but only makes one visible, etc. [08:34] Though not all of the answers match up to the questions. ;D [08:34] I'll start over and try that longer syntax for bzr push [08:34] keithcu: What? Two branches where? Launchpad? [08:34] slow down [08:34] where/ [08:35] yes, launchpad. [08:35] on which page? [08:35] I'll come back another time. I'll fiddle around more. I just want to understand a very simple question: [08:35] Eh. [08:36] I've got my work branch all setup, and I'm trying to setup / push to the trunk branch [08:36] ok [08:36] I used bzr push lp:openracing, but maybe I should try bzr push bzr+ssh://bazaar.launchpad.net/~openracing/openracing/main [08:36] It sort of seems like they are the same but maybe not [08:38] I deleted my trunk branch which was in launchpad and I'll try it again. [08:38] keithcu: lp:openracing is just a shortcut. If bzr+ssh://bazaar.launchpad.net/~openracing/openracing/main is the openracing project's default branch, it'llpoint to it. [08:38] Yes, that is what I thought. [08:38] ok [08:38] what i suggest you do is [08:38] delete that branch on launchpad [08:38] push to the ssh url [08:38] then link it as the main branch for the product through the web ui [08:39] guys I am testing by committing changes to a branch.. basic stuff. Now how do I revert to previous revisions in the branch? [08:39] bzr revert? [08:40] Okay, poolie, I wil try that. [08:41] jeez, cBro2007, sit down with the documentation and experiment. [08:42] Poolie, that worked. I think I created the branch in launchpad first and that messed things up or something [08:43] CBro2007: check out http://doc.bazaar-vcs.org/bzr.dev/en/user-guide/index.html [08:44] Poolie: my mistake was that I registered a hosted branch before I created it. [08:44] And when I do that, I can't push to it, or something. [08:44] thumper, jml ^^ [08:44] it should work [08:44] it is kind of a confusing situation [08:44] poolie: we are aware of it and have decided on a course of action :) [08:44] oh yeah [08:44] poolie: but neither of us will do anything about it tonight. [08:45] (: [08:45] you're going to remove the option to create them? [08:45] basically, yeah. [08:45] there's an open bug.- [08:45] okay, so that was my problem? [08:45] thought so [08:45] keithcu: in the meantime, bzr push --use-existing-dir, IIRC [08:46] Okay, I tried that but thought something went wrong. But I think that might have worked. [08:46] * igc dinner [08:46] But now it works and everything looks good: https://code.launchpad.net/openracing?field.lifecycle=ALL [08:46] Thanks!!!!!!!!!!!!!!!!!!!!!!! [08:47] I spent an hour on that simple thing... [08:47] Well, congrats on getting it working. :) [08:47] yep, feels good. [08:48] okay, thanks again, I understand the "suggested" workflow. Bye [08:48] sorry for the confusion [08:48] no problem. But I do suggest to focus your documentation on the launchpad workflow as many bzr people will be using launchpad [08:49] Well, I'm off to code. Thanks for your help... === serg_ is now known as serg [09:46] whats the difference between doing a "revert" and an "uncommit"? [09:46] Just want to know the consequences of doing that [09:47] CBro2007: Revert is about the working tree, Uncommit is about the branch history. [09:47] ok [09:48] so revert will not get rid of any of the committed branches yeah? [09:48] CBro2007: Right. [09:48] k === kiko is now known as kiko-afk [10:07] i've rm'ed a few files. how can i remove them from my bzr repo? bzr is refusing to ci/rm the files because they dont exist. [10:07] Just commit? [10:08] Kamping_Kaiser: For better or for worse, "bzr commit" automatically removes missing files. [10:08] Peng, ah, ok. i'll ignore a few things then commit the missing files. cheers. [10:10] If you have other changes, you could also shelve them, then commit the removals, then unshelve. [10:18] i have a dozen files i want ignored (which bzr isnt ignoring), and these 5 pngs. I could ... i wonder . brb. [10:18] * rockstar loves the new progress bar. [10:19] still doesnt ignore if the files are added. oh well. [10:19] Well, that's because ignore is a filter on nadd :p [10:19] on what? [10:20] nadd. It's sorta like add. The 'n' is silent. [10:20] it must be bzrs fault, i can't *possibly* be at fault :P [10:20] * Kamping_Kaiser wishes ;s [10:21] commitng the dir the images were in seems to be doing the trick. probably what Lo-lan-do was trying to tell me 15 min ago *heh* [10:22] Not really, I was suggesting a full commit; but you're right, I should remember about the possibility of committing a single dir, I often forget about it. [10:26] thanks for the pointers - think i'm getting ignore sussed too. (remove --keep is handy too) [10:28] * fullermd has rm aliased to --keep, and dark memories of the day when it was changed :p [10:30] rexbron: they just weren't merged yesterday, I still plan to review them [10:43] hello [10:45] is there a way to run a command when bzr commit is run but *before* the actual commit? I'd like to modify a file on every commit, before and save the modified file with in the same commit [10:53] gioele: There's probably a hook for that. === UdontKnow is now known as root [11:03] lifeless: ping [11:08] gioele, look for the start-commit hook [11:14] Lo-lan-do, jelmer: thank you. I'll use those. Actually my hope was to just write a line in a conf file and have my script run on every commit, but those python hooks are nice enough [11:55] guys if I have setup the shared repository structure as shown in the user guide, I was wondering whether I have to copy my files to the "trunk" dir and then do a bzr add? [11:55] do I have to do a "bzr init" in the project dir? [11:56] ? [12:00] can someone help? [12:01] project1/ # A repository for project1 [12:01] +- trunk/ # The mainline of development of project1 [12:01] +- branches/ # A container directory [12:01] +- foo/ # Branch for developing feature foo of project1 [12:01] ... [12:01] I use this model [12:01] should I then have to get into the "trunk" directory and do a "bzr init"? [12:01] before I can add files to this dir? [12:01] CBro2007: how did you create the trunk/ directory ? [12:01] manually [12:02] I created the repository with init-repo [12:02] then yes, you will need to cd trunk && bzr init . [12:02] and then went into that dir to add in the structure I wanted [12:02] then copy my files into trunk and bzr add , then initial import -commit yeah? [12:04] yep exactly [12:04] And then I need to fork out like a seperate branch from this trunk [12:04] like a fresh copy to start adding features on [12:05] Can I just go : bzr branch /proj1/trunk /proj1/branches/foo [12:05] ? [12:06] asabil: would that work? or do I have to PUBLISH my branch first? [12:06] CBro2007: that works perfectly [12:06] (that's the workflow I use myself) [12:06] which one? the first one? [12:07] so I can branch out first and then publish my branch later so others can collaborate? [12:08] it says the target directory already exists [12:08] maybe I should get rid of the branch [12:23] CBro2007: yes, you don't need to create the directories yourself [12:23] bzr branch will do it === kiko-afk is now known as kiko [12:49] yep done all that [12:50] worked out real good... also managed to PUBLISH my branches === AfC1 is now known as AfC [12:50] Is there a reason you keep saying "publish" in all capitals? [12:55] hiya, i'm getting a MemoryError when I try to commit a move of some directories (containing arround 700 files) into another directory - http://paste.pocoo.org/show/104281/ [12:55] this is on AIX... [13:03]