=== abentley1 is now known as abentley === davidstrauss_ is now known as davidstrauss [08:15] mwhudson: Who's the copyright owner for your contributions to Loggerhead? You or Canonical? [09:17] Peng_: most if not all were done on canonical time [11:44] hey folks... I read through most of -> http://doc.bazaar-vcs.org/bzr.dev/en/user-guide/index.html but was wondering if there is a document saying in like 10-20 lines: first do bzr init, then bzr add, this is how to set acls, this is how to branch and merge, done [11:45] so basically, what I am looking for is a bzr in 60 seconds [11:46] nayone know if such doc is available anywhere [11:51] unfortunatly I can't expect all of my users to read through the entire users guide [11:51] surely I could write a 10-20 liner myself, but why should I if such a doc allready exists...? [11:51] plus, I'm not even sure, if I'm getting everything right [11:51] baccenfutter: http://doc.bazaar-vcs.org/latest/en/mini-tutorial/ [11:53] wgrant: nice, thx [11:53] now all I need is acl and I am set [12:59] Peng_: canonical [13:06] mwhudson: OK, thanks. I wanted to know because I was thinking of putting the GPL header in some of the files that lack it. (But I'm probably not gonna do much of it.) [13:10] (IANAL, so I'm kind of afraid of getting it wrong.) [13:41] I could use some advice on setting up a working centralized bzr repo. I'm member of a local computer club with about 300 members. each member has a user acc on our shell server. Inside each $HOME there is a /public_html/ which is linked to our apache2. Now what I want to achieve is to have my very own bzr repo which is writeable only to certain users, while it is readable to 'world'. I can't find anything about acls though. If I place the rep [13:43] Or am I getting this completly wrong?! [13:49] Yay 2.0.1 Ubuntu Package is out now. Upgrading. [15:12] anybody...? [15:12] baccenfutter: Eh. You got cut off at "If I place the rep" [15:13] the repo in $HOME, it is only acessable through ssh if I put it into $HOME/public_html/ it is writeable to 'world'. Now how would I have to go about? [15:14] ...public_html is world-writable? [15:14] In svn I had acls to take care of this [15:15] Peng_: no, but it is world accessable its like you would place your repo in /var/www/ [15:15] Sorry, but I really don't have experience with this. Launchpad does it using anonymous HTTP access + a custom SSH server. [15:16] so I see it crrectly there is no such thing like acl [15:16] ? [15:16] baccenfutter: Maybe the contrib.bzr_access script would help? [15:17] Err, contrib/bzr_access. [15:17] I'll chack that out, thx [15:18] Like I said, I don't have experience with this stuff. [15:23] Peng_: where would I find that? [15:29] baccenfutter: contrib/bzr_access? In the source tree. [15:30] baccenfutter: http://bazaar.launchpad.net/~bzr-pqm/bzr/bzr.dev/annotate/head%3A/contrib/bzr_access if you don't have it handy [16:25] hi [16:26] I branched from svn trunk, then made a few commits. now I want to push just one of them, and keep the rest in my local branch. I checked the docs but don't know where to look; anyone can point me in the right direction? [16:31] nyu: You can push all revisions up to and including revision N with "bzr push -r N". [16:33] Peng_: and if I wanted to push only revision N ? [16:34] nyu: You want to push revision 123 but not 122? Not pisslb.e [16:34] Wow, that sentence fell apart. "possible." [16:35] ah, maybe I'm not using the right approach [16:35] Well, technically, it's more or less possible with history editing from the bzr-rewrite plugin, but mostly you shouldn't do that. [16:35] on one hand, I like the "patch stack" model in which I stack lots of patches in, but I also like being able to stuff unrelated patches in my repository [16:36] as a replacement for .diff files liing around in my filesystem [16:36] I guess you should create a branch for each one. [16:37] is there no easier way? [16:39] Eh. I don't think so. [16:40] ok, I guess I can live with adding more branches [16:40] what if I want to modify one of my commits before pushing it? [16:40] Commit again? [16:45] you mean on top? [16:45] but then I'd be pushing the broken commit + the fix, what if I'd rather only push the fixed version? [16:46] e.g. imagine I send a patch for review and commit it locally, then someone notices a typo [16:46] how can I commit the right thing in trunk? [16:48] In Bazaar, you typically just create a second revision fixing the typo. [16:49] when you push a set of commits, they become a single commit in svn, or multiple ones? [16:50] Multiple [16:51] If you were using pure Bazaar instead of svn, and merged them into the target branch, the log view would only show the merge revision by default. [16:55] not an option right now [16:55] the project trunk is on svn. some people use git to manage their own patchsets [16:56] and I'd like to use bzr to do the same [16:56] my workflow is not very organized; I have a directory full of patches that I move back and forth manually [17:00] Git might work better for you. [17:02] oh, c'mon don't tell me this :-) [17:04] nyu: I haven't tried myself, but I hear bzr-pipeline is good for managing patchsets [17:04] or loom [17:05] what if I manually extract a set of commits, then commit them into svn, then bzr pull? [17:05] Oh, I forgot about pipeline. [17:05] nyu: bzr-svn won't see them as the same revisions, but you can do that, yes. [17:05] so what will bzr believe after pull? [17:06] will it still think it has diverged from trunk? [17:08] nyu: Yeah. You can use "pull --overwrite" tohough [17:08] trhough. though. There, got it. [17:08] but that gets rid of all my commits, right? [17:08] not just the ones that were merged [17:11] pipeline manages your patches as branches. Once it's merged, you just drop it. [17:11] (from what I understand. I haven't used it myself, but it's at the top of my list of things to learn) [17:41] nyu: Yes, sorry. [17:45] I need to figure out which, if any, of bzr-pipeline and loom are useful to me [17:45] iiuc there's some overlap between the two === sdboyer_ is now known as sdboyer === davidstrauss_ is now known as davidstrauss