[00:26] how can I create a branch from a previous revision? I tried bzr revert -r### and then bzr push'ing that code, but the pushed code contain the same as the trunk [00:28] cr3: bzr branch -r1234 . ../other [00:28] igc, do you think we still want the non-sphinx doc builds? [00:28] i'm working on this atm [00:31] poolie: excellent, thanks! [00:32] cr3: if you want to push something somewhere, push -r xyz URL [00:44] igc: sphinx build seems to be passing in the chroot now [00:44] output not copied yet [00:44] thwack- well up to the point of wanting pdflatex [00:55] poolie: I don't see a need for non-sphinx builds [00:56] k [00:58] would it be hard for me to modify bazaar to only let me uncommit twice daily? [00:59] not at all [00:59] write a plugin, decorate the command [01:00] lifeless: ok, i need to make it hard for me to find a way around it [01:00] i'm struggling with a mental condition [01:01] and after reading an article, i figured out that i need to limit how many times i can repeat operations in order to fix the condition === oubiwann_ is now known as oubiwann [01:06] hi i have a very basic question, i would like to use bzr for managing my symofny project, it is now on local, i want to push it to my sftp server, do i have to do anything on my server? like installing bazaar? [01:07] maredzek: to push using sftp you just need a sftp-capable ssh server [01:07] maredzek: no bzr server is necessary on the server side [01:08] ok i have one, i used: [01:08] arek@marek-laptop:/var/www/fakt$ bzr push --create-prefix sftp://admin@91.121.177.88/var/www/ble --use-existing-dir [01:08] but apart from .bzr dir i cannot see anthing in /var/www/ble.... [01:09] maredzek: it will just create a branch, not a working tree [01:09] * maxb wonders if anyone else has used bzr qlog on branches with 10000 revisions before [01:09] maredzek: yes [01:09] It appears to trim revnos to 4 digits :-) [01:09] s/maredzek/maxb/ [01:09] maxb: IIRC there is an open bug about that [01:10] how can i upload "working tree"? [01:10] maredzek: you can either run 'bzr co' on the remote side (will create a working tree, but required bzr to be installed) [01:10] maredzek: or you can avoid push and use the 'bzr-upload' plugin [01:10] maredzek: that will just upload the contents, not any of the history [01:10] maredzek: if you want just the tree and not the history, e.g. to publish a website, then the bzr-upload plugin jelmer mentions is probably a better fit [01:11] ok, so if i will have 3 people working on this project, it is better to use bazaar on remote side? [01:13] what will happen if: [01:13] there is a file action.class.php already on sftp server, commited with bzr-upload [01:14] then devA adds two funstions in this file and uploads [01:14] * maxb can't find a qbzr bug for that [01:14] hwo devB coulc know that somebody modified that file? [01:14] ok, dont answer that [01:15] i would like to have smth like my launchapd [01:15] i have to isntall bzr on server [01:15] and init projects [01:15] and also i need to install bzr on clients [01:15] and checkout and commit from them right? [01:19] how can i install bazar upload? [01:21] maredzek: if you are using ubuntu, you can just apt-get install bzr-upload [01:22] maredzek: http://doc.bazaar-vcs.org/test/en/user-guide/plugins.html [01:26] ok so my quewstion, how should i use bazaar if i have a couple of developers, working now remotely on clients server [01:40] igc: ok i think it's all running aside from pdf generation which is waiting on a gsa [01:41] maredzek: http://doc.bazaar-vcs.org/latest/en/user-guide/index.html [01:41] igc, i'm going out to run an errand and then will look for breakage (which likely exists) when i get back [01:42] pdfs are rt 36401 btw [02:20] lifeless: is it possible to completely remove the uncommit feature from bazaar? [02:20] as long as repeating things is possible, i'll be stuck in an infinite loop [02:21] meoblast001: sure, a plugin could do that [02:21] lifeless: i need something that is very hard to disable [02:21] i'm fighting myself here, so i need to outsmart myself [02:21] meoblast001: sorry, can't really help you there - seriously. [02:22] i'll try to find something out [02:22] bzr --no-plugins will disable plugins [02:22] apt-get install will restore a base bzr with the feature present [02:24] lifeless: maybe i just need to see a psychologist or suck it up and figure things out myself [02:28] meoblast001: maybe something less drastic than total removal would help, e.g. make uncommit trigger an annoying buzz sound? [02:29] meoblast001: anyhow, writing a plugin is probably going to be the best way to do any of these options. [02:29] spiv: that won't work [02:29] i'm trying to fight OCD (repetitive things) and it can get very bad [02:29] luckily i don't have a severe case, some people do things for hours on end [02:30] i can just sit uncommitting and recommitting multiple times until i have to hit myself [02:30] but a buzzing sound won't stop me [02:30] meoblast001: so, if I thought I had something wrong with me, I'd go see a doctor ;) [02:30] i need to make it impossible [02:30] lifeless: but you're not a dependent [02:47] i dont completely understand Distributed development [02:48] can you confirm is it corrct? [02:48] 1. on main server [02:48] maredzek: in the user guide? [02:48] spiv - yup: [02:48] 1. on main server - i create bzr with init [02:48] add and commit [02:48] right? [02:49] maredzek: it doesn't really matter how you create the branch on the server [02:49] ok, so next [02:49] maredzek: it's probably simplest to create it locally and then 'bzr push' it to the server [02:49] ok [02:50] but when i push to server - server needs to have bzr right? [02:50] maredzek: nope [02:50] maredzek: you can use plain SFTP, for instance. [02:51] ok but when i tried to push files from my machine to my server, only .bzr folder was created [02:51] no files were pushed [02:51] Right. [02:51] and i need to use uplaod plugin [02:52] so if i create file slocally and push to server, i will have no files in it - right? [02:52] Because 'bzr push' pushes a branch, which is a line of development. But it sounds like you want/need the tree of files on the server. [02:52] hmmm [02:53] i'm starting to understand [02:53] Operations to do with branches and operations to do with trees of files are mostly separate things. [02:53] so i will have 3 developers [02:53] they will work on php framework - symfony [02:53] they will have thoose installed locally [02:53] Some operations involve both, e.g. "bzr commit" takes the current tree and records that as a new version on a branch. But mostly they are separate concepts. [02:54] so tell me, how files will travel between developers? [02:54] via central server? [02:54] or directly between devs? [02:54] For you, I think you perhaps want to think about "commit and share changes" as being not necessarily the same as "deploy changes to live web site" [02:55] i was thinking about this kind of architecture [02:55] 3 devs (bzr) -> central repo (bzr) -> live web serwer (no bzr) [02:55] Sounds reasonable. [02:56] last arrow - only from time to time [02:56] like after completeing milestone [02:56] Right. [02:56] You could use the bzr-upload plugin for that (it can work over SFTP I believe). [02:56] upload plugin for last arrow right? [02:57] Or you could have a developer do a "bzr export" to get a tree and then rsync it. [02:57] Right. [02:57] ok, so dev1 wil lcreate new module [02:57] test it, change files [02:57] locally [02:57] spiv: upload works over sftp [02:58] and he would commit changes locally [02:58] and see if his work works :) [02:58] maredzek: that's an important step :) [02:59] can this be automated? [02:59] which part(s)? [02:59] dev1 adds 3 lines to class.php [03:00] saves file in his editor [03:00] we have to commit it manually on his local repo? [03:01] ok so he will, he does 5 or more tasks from this module [03:01] and wants to upload that data to central repo [03:01] how it is done [03:01] upload dont saves revision history right? [03:02] push will do spiv? [03:03] Right, push updates (or creates) a copy of the branch. [03:04] so command will ok like: [03:06] bzr push --create-prefix sftp://your.name@example.com/~/public_html/my [03:07] Sure. [03:09] ok so why after this push i can see no files in central server? [03:09] thats is the part i dont understand :) [03:09] it updates the branch data [03:09] not the working copy [03:09] there's an update-after-push plugin that does that [03:10] if i install this plugin, will it upload all files or only modified ones? [03:11] I think it just does 'bzr up' on the remote side [03:11] so neither - it'll get updates from the remote branch [03:11] remote branch = central server? [03:15] If I have a binded branch that I've made local commits to, my understanding is that I should be able to do a normal commit to have everything uploaded. Is this correct? [03:15] Because I'm trying this with bzr 2.0.2 and it isn't working. It says I have to run bzr update first which last time caused all sorts of incorrect conflicts. [03:15] maredzek: = whatever you push to [03:16] cody-somerville: if it is bound and you made commits, they're already "uploaded" [03:16] bob2, I made local commits [03:16] maredzek: People can "bzr branch", "bzr pull" etc from the place you "bzr push" to. [03:16] bob2, ie. bzr commit --local [03:16] cody-somerville: to minimise issues with local commits, make sure you have no uncommitted changes before updating. [03:17] cody-somerville: then you need to catch up to the remote branch before you can 'push' to it [03:17] up on a bound branch with missing commits should probably bail if you have uncommited changes [03:18] I am up to date. [03:18] I'm ahead [03:18] spiv, so devs are push-ing to central server, and also pull-ing from central server, right? [03:18] or bound branches could go away [03:18] cody-somerville: if you're ahead just push to the master [03:18] maredzek: right. [03:19] lifeless, shouldn't bzr commit do that automagically? [03:19] thats what bzr help commit advertises it will do [03:19] spiv, so i pushed to central server not files, but information about what i changed, right? [03:20] maredzek: the complete record of what you have changed, from which the files can be reconstructed by bzr, e.g when someone does "bzr branch" of that location [03:20] cody-somerville: it will unless you committed offline [03:20] spiv, okay, thanks for that. made another local commit and ran bzr update. However, now all my commits are "rebased" (they show up as a pending merge). [03:20] cody-somerville: which is the only possible way to get ahead of the master [03:20] --local Perform a local commit in a bound branch. Local [03:20] commits are not pushed to the master branch until a [03:20] normal commit is performed. [03:20] cody-somerville: that is almost exactly not what rebasing is! :) [03:20] cody-somerville: ok, if you've done a local commit and an up, now do a commit. [03:21] lifeless, I tried to and it said I needed to run update [03:21] cody-somerville: no, you tried before you updated [03:21] spiv, so dev1 puts that info to central server, where dev2 will obtain files? it will ask central server about changes, finds that dev1 have changed 4 files and then? download them from dev1 repo? [03:21] lifeless, oh, right. it'll commit just fine I'm sure. [03:21] maredzek: all the data is on the server [03:21] cody-somerville: after a commit --local you must either push, or update + commit, to make the local commit be centralised [03:22] lifeless, the help should be updated then [03:22] maredzek: the .bzr directory contains a database with all the files and their changes etc compacted into it. [03:22] ahhhh ok! [03:22] cody-somerville: yes [03:22] i got it 100% [03:22] lifeless, it suggests to me that it'll automatically push all commits (and I think it should) if an update isn't needed. [03:22] cody-somerville: huh? [03:22] i will instal lupdate_after_push plugin [03:22] oh, the subsequent commit? [03:23] lifeless, No one else committed to the master branch while I was working offline [03:23] its an area forimprovement [03:23] lifeless, so now that I'm online and do a normal commit, everything should just be pushed [03:23] * cody-somerville nods. [03:23] and when dev1 will push something, also all files wil be uploaded to central serfver right? [03:23] the way it works now, I have to merge in all my commits into a single commit [03:23] cody-somerville: or do a push, as I mentioned before [03:23] cody-somerville: rather than an update [03:23] cody-somerville: note that your commits are still itemised [03:24] cody-somerville: just folded up [03:31] lifeless, how do I view the full commit message for pending merge tips? [03:34] what do you mean [03:36] "bzr st" I imagine; it only shows the first line. [03:36] * Peng is guessing, and goes /away === oubiwann_ is now known as oubiwann [04:33] igc: do you know what the status is for the doc building? I don't see http://doc.bazaar-vcs.org/bzr.2.0.2/downloads yete. [07:11] hi, im using bazaar for one day, how can i "save" sftp passwords? [07:11] it is quite annnoying to type them each time i want to push [07:11] don't [07:11] use ssh keys instead [07:15] it is something like this bob2? http://pkeck.myweb.uga.edu/ssh/ [07:16] that's the basic deal [07:17] if you're on debian or ubuntu: ssh-keygen ; ssh-add ; ssh-copy-id remotehost [07:17] im on uubntu [07:18] just do the above then [07:18] that page makes you do far too much work :) [07:26] hi all [07:27] * vila never saw a network switch fall apart. Now he has. [07:53] hi, what does it mean? http://pastebin.com/m27d6ee04 [07:53] i wanted to push [07:53] from locahost to remote === Guest97231 is now known as mkirby [08:39] I just installed bzr and am trying to follow the online docs but am getting an error when I try to 'bzr svn-import' in folder where I checked out from an svn repo [08:41] bzr: ERROR: unknown command "svn-import" [08:41] C:\pelco\source\vmas>bzr --version [08:41] Bazaar (bzr) 2.0.1 [08:41] Python interpreter: C:\Python26\python.exe 2.6.2 [08:41] Python standard library: C:\Python26\lib [08:41] Platform: Windows-post2008Server-6.1.7100 [08:41] bzrlib: C:\Python26\lib\site-packages\bzrlib [08:41] Bazaar configuration: c:\python26\Scripts\bazaar\2.0 [08:41] Bazaar log file: c:\python26\Scripts\.bzr.log [08:43] I thought the bzr installer came packaged with svn client support [08:43] Here is the doc where I started from: http://doc.bazaar-vcs.org/latest/en/user-guide/svn_plugin.html [08:47] mkirby, You've installed the python distribution... which alas, does not come with so many batteries [08:47] mkirby, It's good for the server (you seem to have installed it on a server) because you can configure a smart server to run with IIS off it [08:48] mkirby, But doesn't have any bundled plugins like the py2exe distribution does [08:48] awilkins, thanks. this is my win7 dev box [08:49] awilkins, I think I saw a bzr installer with python included, will that work? [08:49] mkirby, You want the one that ends -setup.exe [08:49] mkirby, The python included ones have a useful selection of plugins [08:50] i see it: Standalone http://launchpad.net/bzr/2.0/2.0.1/+download/bzr-2.0.1-1-setup.exe [08:50] That's the one [08:50] k, thx [08:51] mkirby, For svn interop I just prefer to branch straight from the SVN server [08:51] awilkins, is that not using svn-import [08:52] bzr checkout svn+ssh://svn.gnome.org/svn/beagle/trunk beagle-trunk [08:52] mkirby, With the bzr-svn plugin you can just ` bzr branch http://my.svn.server.org/my/branch ` [08:53] You end up with a local native bzr branch ; I then tend to branch that for feature branches, keep the direct branch up to date with the SVN repo and merge those revisions outward before merging my feature back to it and pushing it up to the SVN repo [08:53] Depends on whether you have the ability to move development away from the SVN repository or not [08:54] it is a different team that controls the repo/build artifacts... but we are on good terms ;) [08:54] mkirby, I wouldn't use a checkout because that will bind the branch to the remote repo ; it will try to push any local commits to the remote repository [08:55] I like all the workflow bzr supports and ease of branching, but I'll have to try first before I can sell the company on it [08:56] mkirby, bzr-svn is excellent ; it provides the benefits to you even if you can't sell the company on it because you have full read/write interop with your SVN server [08:56] Could be a selling point ; you can migrate developers incrementally [08:57] awilkins, agreed [08:57] If any of them have to work outside the office they would be great targets for evangleism [08:57] awilkins, ppl are already complaining about branching an merging in SVN, so I need an alterative [08:58] awilkins, yeah we have remote offices that suffer the co,ci cycle [08:58] mkirby: what version on svn are you using? [08:58] jszakmeister, 1.5.4 (r33841) [08:59] Merge tracking isn't working for you? [08:59] mkirby, The 1.6 series has better branch/merge management but still (AFAIK) suffers from weaknesses [08:59] I saw bzr support the merge tracking info in svn [08:59] jszakmeister, ppl are still making mistakes... not using --reintegrate etc. [09:00] Ah. [09:00] I like the pqm (think that is right) idea too [09:00] * jszakmeister agrees [09:00] * awilkins also agrees [09:01] Alas, our current contractor has produced code with 0.3% test coverage [09:01] I've been using bzr-svn in a production environment for a while now... it's definitely worth playing with [09:01] :-( [09:01] That hurts. [09:01] jszakmeister, thanks, don't want to risk my job if things started failing/corruption [09:02] I've been using it over a year since around the 0.5 versions [09:02] It's using the svn libraries to interact with the repo [09:02] I think the worst thing I've ever seen it do is duplicate data [09:02] ...so it behaves much like the real svn client [09:03] (as in - not use previous bases and deltas, not make extra trees) [09:03] excellent [09:03] ru guys linux or windows users for bzr? [09:03] mkirby, Both [09:03] excellent [09:04] The stuff that would really confuse folks, like reordering your mainline commits in SVN, are disabled by default [09:04] Same here [09:04] The windows performance has really improved since the earlier versions [09:04] since? [09:04] It started out, it kicked SVNs ass. (like, SVN was a 12 minute checkout on this tree, Bazaar was 4) [09:04] Now it _really_ kicks its ass [09:05] we are using crucible for changeset reviews, anything like that I can work into a bzr workflow prior to hitting trunk? [09:05] it's for 2a? [09:05] mkirby: remind me how crucible works... you submit a diff? [09:05] bialix, The performance increments on Windows came mostly around ... oooh, 1.6? 1.9? [09:06] bialix, The readdir() implementations... I've not noticed 2a being that much faster (and it packs a lot slower) [09:06] well, I've noticed this even earlier, but 1.9 is safe choice [09:06] jszakmeister, they mostly trigger off changesets that are already commited, but you can push a dif, but it is a pita to get the full context from svn diff command [09:07] That's what I though... it was kind of designed for post-review of changesets [09:07] jszakmeister, exactly [09:07] awilkins: readdir for win32 was added around 1.6, maybe 1.7 [09:07] ReviewBoard can do pre-commit reviews (that's what it was designed for) [09:08] We've been using it at our place. It's better than nothing, but could stand to get a few improvements [09:08] k, i'll check it out [09:08] jszakmeister, awilkins, you guys in here much? [09:08] Occasionally. [09:08] Often [09:08] Depends on whether I remember to fire up the IRC client. [09:08] you've been a great help to ease my mind. [09:08] Most of my day, I'm away though. :-( [09:09] mkirby: check out an article I wrote: http://www.szakmeister.net/blog/2009/oct/12/bazaar-subversion-super-client/ [09:09] k [09:10] And the migration docs: http://doc.bazaar-vcs.org/migration/en/ [09:10] jszakmeister, "$ bzr branch http://svn.example.com/svn/project-name/trunk/ trunk" in your First steps [09:10] thanks [09:10] In particular, http://doc.bazaar-vcs.org/migration/en/foreign/bzr-on-svn-projects.html [09:10] ahh, I read the migration doc already [09:10] Cool. [09:11] My article has very similar information (both were written by me), but I tried to call out a few more of the individual steps in the article. [09:11] ("bzr branch http://svn.example.com/svn/project-name/trunk/" would work too, since the default destination is the last directory in the URL, in this case "trunk".) [09:11] jszakmeister, excellent. have you checked out buildbot that google is using for chrome? [09:12] I dunno if Google is using something different, but I've looked at buildbot before. [09:12] It's not my first choice for a build tool. :-) === kklimond- is now known as kklimonda [09:13] Quickbuild is: http://www.pmease.com/ [09:13] I like all the stats it collects per build/test run [09:14] jszakmeister, http://build.chromium.org/buildbot/perf/xp-release-dual-core/new-tab-ui-cold/report.html?history=150 [09:14] It does have some useful stats... I just think that are some others that are easier to set up... at least in a corporate environment. [09:15] jszakmeister, you gave me a good start with bzr, and a lot to look into. thanks for your time [09:15] awilkins, thanks alot too! [09:15] Your welcome! [09:15] mkirby, You're welcome... I think it's the best choice for Windows unless you have some seriously large projects. [09:15] maredzek: Re your earlier error, that's coming from trying to push from a rich root repo (2a format) to a poor-root (0.92 or 1.9, I'd guess) [09:20] poor-root, lol [09:21] Well, unless you're in New Orleans; then it's a poroot. [09:33] jszakmeister, you wrote: http://doc.bazaar-vcs.org/migration/en/foreign/bzr-on-svn-projects.html [09:34] Yep [09:34] what did you use for the diagrams? [09:34] http://doc.bazaar-vcs.org/migration/en/_images/rebase-before.png [09:34] I used Omnigraffle. [09:34] Best diagramming tool evar! [09:35] ah, I love their tools [09:35] Only available on a mac though [09:35] I know... [09:35] Yeah, they're great [09:35] I'm running OSx86 just so I can have those on my laptop [09:35] :-) [09:36] I have to admit, they weighed in my decision to move to a Mac [09:36] closest thing I've found is gliffy... web based, but still not as smooth and featured [09:37] Heh. Neat! [09:37] collaboration works well too [09:37] in gliffy that is. [09:37] Cool! [09:38] cool [09:39] be careful, it acts up when you start copy/paste a lot of objects/lines [09:40] but it works well when everyone has their laptops and we sketch a design. I'm waiting for google docs to get something like this. [09:43] jszakmeister, bzr branch http://svn.myserver.org/svn/project/trunk tells me "Error: Not a branch" [09:44] What's the top-level layout look like? [09:44] trunk/, tags/, branches/? [09:44] yes [09:45] That's odd. [09:45] svn ls yeilds branches/ [09:45] tags/ [09:45] trunk/ [09:46] i'll throw the last slash on... [09:47] jszakmeister, maybe it is my authentication [09:47] it is asking for creds to on the bzr command, is that normal? [09:48] It usually uses the cached credentials provided by svn [09:48] ...so no [09:48] try using svn+http://... [09:48] do I need to be in my svn wc? [09:48] No [09:48] k, good, and do I need to do a bzr init? [09:48] No. Just branch and go [09:49] It might be the OPTIONS probe that's causing trouble... [09:49] bzr-svn does that to see if the remote end is a SVN server [09:50] Some server setups seem to dislike it though [09:50] svn+ disables the options probe [09:50] unsupported protocol [09:51] Does 'bzr plugins' show svn? [09:51] svn+http://svn.myserver.org/svn/project/trunk [09:51] I think you might be suffering fallout from your previous install of bzr [09:52] No module named qbzr.lib.commands [09:52] Ouch. [09:52] jszakmeister, I think you are correct [09:53] I'll give it a shot on my linux box and windows box @ work === arjenAU2 is now known as arjenAU [09:54] this time I'll pull the standalone for the windows box [09:54] @ work [09:54] How did you install bzr before? [09:54] bzr-2.0.1-1.win32-py2.6.exe [09:55] then I pushed bzr-2.0.1-1-setup.exe over the top of it I guess. [09:55] Oh, I see. [09:55] You might want to uninstall that [09:55] ohhh! [09:55] I think I still have the old one in PATH [09:55] the -setup has everything... exactly. [09:56] yeah, i remember setting up the path... let me kill it [09:56] haha, %BZR_HOME%;C:\Program Files\Bazaar [09:57] the %BZR_HOME% is me, the other is from the new install [09:57] Nice. :-) [09:58] jszakmeister, sweeeeeet [09:58] That sounds like success. :-) [09:58] I like the progress bar [09:58] * jszakmeister too [09:59] It's a nice bit of user feedback [09:59] If I run Branch.open(), what exceptions can I expect from that? [09:59] ok, so I'll still read up on your article, but when I do commits, it will be local, then a push will land it on trunk [09:59] Yes, if you used 'bzr branch' [09:59] NotBranchError? [09:59] The best workflow is probably to a branch and merge paradigm [10:00] jszakmeister, k, great [10:00] Otherwise, you're going to have to get familiar with rebase [10:00] i've rebased in SVN on my branches, prior to reintegrating... [10:02] but I understood how you kept your trunk, branched, cd to branch, committed, then moved back to ur trunk and merged the branch directory in. [10:02]