=== abentley [n=abentley@bas8-toronto63-1088754407.dsl.bell.ca] has joined #bzr [12:25] It could be useful if you and the other Python VCS people (Mercurial, Codeville, ???) got together to create a "vcsutil" or something package, with stuff like patiencediff and lazy_import and hg's C diffing and patching and whatnot, and Codeville's merging algorithm... [12:28] Peng: Why? Everyone's going to be using bzr soon enough. ;) [12:28] Heh. [12:28] Well, it would still be nice to help out those crazy Mercurial guys, then. ;) [12:29] :D [12:29] Is Codeville's merge algorithm easily portable to other VCSes? [12:33] Codeville, is that Bram Cohens' VCS? [12:33] Yeah. [12:34] I don't think it has much momentum, but it has a cool merging algorithm. [12:34] Peng: See http://bramcohen.livejournal.com/37690.html === mw|out [n=mw@189.146.12.152] has joined #bzr [12:35] jelmer: Yeah, I've read it. === orospakr [n=orospakr@CPE001a70d1de84-CM0019474a8676.cpe.net.cable.rogers.com] has joined #bzr [12:39] Peng: Those implementations all make different assumptions about inputs / outputs [12:39] some are line-based, some binary, etc === pete__c [n=pete@032-463-246.area7.spcsdns.net] has joined #bzr [12:40] Aww. [12:40] bzrlib.lazy_import would be good, though. [12:40] mercurial.demandload is kind of yucky. It catches all imports, not just ones passed to it. [12:40] That does make it easier, though. [12:40] Yeah, some things could definitely be shared, indeed [12:40] I guess lazy_import would even be useful for non-vcs python apps [12:41] Yeah. === mw|out is now known as mw === BasicOSX [n=BasicOSX@gatekeeper.tanners.org] has joined #bzr === cypherbios [n=cyr@ubuntu/member/cypherbios] has joined #bzr === asac_ [n=asac@debian/developer/asac] has joined #bzr === fog [n=fog@debian/developer/fog] has joined #bzr === asac_ is now known as asac [02:01] New bug: #139863 in bzr-dbus "" [Undecided,New] https://launchpad.net/bugs/139863 === orospakr [n=orospakr@CPE001a70d1de84-CM0019474a8676.cpe.net.cable.rogers.com] has joined #bzr === pete__c [n=pete@032-463-246.area7.spcsdns.net] has joined #bzr === gldnspud [n=gldnspud@72.171.93.139] has joined #bzr === mkanat [n=mkanat@c-71-202-202-106.hsd1.ca.comcast.net] has joined #bzr === NamNguyen [n=namnt@cm246.delta196.maxonline.com.sg] has joined #bzr === duckx [n=Duck@tox.dyndns.org] has joined #bzr === pete__c [n=pete@032-463-246.area7.spcsdns.net] has joined #bzr === Admiral_Chicago [n=FreddyM@st074039212101.monm.edu] has joined #bzr === jdong [n=root@ubuntu/member/jdong] has joined #bzr === AfC [i=andrew@office.syd.operationaldynamics.com] has joined #bzr === NamNguyen [n=NamNguye@cm246.delta196.maxonline.com.sg] has joined #bzr === Mez [n=Mez@ubuntu/member/mez] has joined #bzr === Mez [n=Mez@ubuntu/member/mez] has joined #bzr === Mez [n=Mez@ubuntu/member/mez] has joined #bzr === Mez [n=Mez@ubuntu/member/mez] has joined #bzr === BasicOSX [n=BasicOSX@fortress.tanners.org] has joined #bzr === BasicMac [n=BasicOSX@warden.real-time.com] has joined #bzr === AfC [i=andrew@office.syd.operationaldynamics.com] has joined #bzr === mkanat [n=mkanat@c-71-202-202-106.hsd1.ca.comcast.net] has left #bzr ["Ex-Chat"] === BasicOSX [n=BasicOSX@gatekeeper.real-time.com] has joined #bzr === Mez [n=Mez@ubuntu/member/mez] has joined #bzr === Mez [n=Mez@ubuntu/member/mez] has joined #bzr === Mez [n=Mez@ubuntu/member/mez] has joined #bzr === gldnspud [n=gldnspud@72.171.93.139] has joined #bzr === Mez [n=Mez@ubuntu/member/mez] has joined #bzr === Mez [n=Mez@ubuntu/member/mez] has joined #bzr === matkor [n=matkor@ip83-230-19-175.e-zabrze.pl] has joined #bzr [09:47] Hi ! [09:50] Does revision: should have get_apparent_author() method ? [09:50] For me annotate fails becouse of that [09:51] I see such members: 'committer', 'get_history', 'get_summary', 'inventory_sha1', 'message', 'parent_ids', 'parent_sha1s', 'properties', 'revision_id', 'timestamp', 'timezone [09:51] But docs say sth completly different: http://starship.python.net/crew/mwh/bzrlibapi/bzrlib.revision.Revision.html#get_apparent_author === Mez [n=Mez@ubuntu/member/mez] has joined #bzr === pygi [n=mario@83-131-4-158.adsl.net.t-com.hr] has joined #bzr === Mez [n=Mez@ubuntu/member/mez] has joined #bzr === Mez [n=Mez@ubuntu/member/mez] has joined #bzr === fog [n=fog@debian/developer/fog] has joined #bzr === BasicOSX [n=BasicOSX@fortress.tanners.org] has joined #bzr === BasicOSX [n=BasicOSX@warden.real-time.com] has joined #bzr === g0ph3r [n=g0ph3r@p57A09F63.dip0.t-ipconnect.de] has joined #bzr === Mez [n=Mez@ubuntu/member/mez] has joined #bzr === BjornT [n=bjorn@canonical/launchpad/BjornT] has joined #bzr === rml [n=Skippy@78.32.35.169] has joined #bzr === luks [i=lukas@unaffiliated/luks] has joined #bzr === Mez [n=Mez@ubuntu/member/mez] has joined #bzr === fo1 [n=fog@151.16.11.125] has joined #bzr [01:00] jelmer: do you want a bzr-svn upload? === cfbolz [n=cfbolz@p54AB9266.dip0.t-ipconnect.de] has joined #bzr === fog [n=fog@debian/developer/fog] has joined #bzr [01:43] jelmer: Could you please merge few more fixes fro bzr-gtk from https://code.launchpad.net/~matkor/bzr-gtk/trunk-matkor ? Please take look at gannotate fix becouse I am not sure if it is proper. It makes gannotate work though... TIA === fog [n=fog@debian/developer/fog] has joined #bzr === seanhodges_ [n=sean@90.240.81.130] has joined #bzr [01:59] hey does anyone know how to add bookmarks in the Olive GUI? [02:00] I'm running the latest released bzr (0.90.0) === gldnspud [n=gldnspud@72.171.93.139] has joined #bzr === phanatic [n=phanatic@dsl5400C440.pool.t-online.hu] has joined #bzr [02:48] seanhodges_, phanatic is your folk [02:48] he's the olive's author [02:48] morning people [02:50] phanatic, : [02:50] hey does anyone know how to add bookmarks in the Olive GUI? [02:50] I'm running the latest released bzr (0.90.0) [02:51] hey sorry just got back [02:52] seanhodges_: the problem is that you can add bookmarks by right clicking in the file list, and right mouse click doesn't seem to work in 0.90.0 for some reason :( [02:52] ah ok, i thought i was going mad ;) [02:53] seanhodges_: try trunk, it shoudl work [02:53] *should* [02:53] i was about to ask that [02:53] cool, i'll try it out and get back 2 u [02:54] great :) [02:54] i'm a little confused about the whole bzr-gtk thing tho, do i want to check out and compile all of bzr-gtk? or can i take the Olive code and compile it against bzr 0.90.0 release? [02:55] seanhodges_: they are bundled together, so the best would be to get all of bzr-gtk [02:55] no problem, i'll do that [02:55] thanks [02:56] yw, i hope it helps [02:56] pygi: thanks for pinging me :) [02:57] phanatic, you are welcome [02:58] yeah thanks pygi - was definitely helpful [03:04] dato: Yes, please :-) [03:09] phanatic, the latest in trunk works great. Just one thing: it wouldnt work until i modified /__init__.py so the version_info said "0.90.0" instead of "0.91.0" [03:10] I renamed my olive.conf but must have missed some other config files for bzr-gtk? [03:11] seanhodges_: that's the only one... and the version incompatibility check just sucks, but we have to use it to avoid unexpected behaviour [03:11] thats ok, i'll just modify it if/when i update again [03:12] seems to be working fine now tho, thanks for your help [03:31] jelmer: do you have an opinion on 442171? === jamesh_ [n=james@canonical/launchpad/jamesh] has joined #bzr === yminsky [n=yminsky@user-0cevcqv.cable.mindspring.com] has joined #bzr [03:45] bug 442171 ? [03:45] or debian bug 442171? [03:45] Debian bug 442171 in bzr-svn "bzr-svn: please use "Depends: python-pysqlite2 | python (>= 2.5)" instead of "Recommends: python-pysqlite2"" [Wishlist,Open] http://bugs.debian.org/442171 [03:46] yeah, that [03:48] dato: Think that'd be a good idea [03:49] Assuming python-pysqlite2 depends on python :-) [03:49] er, sure it does [03:49] python (<< 2.6), python (>= 2.4) [03:50] so it should be fine [03:51] jelmer: I'm going to have lunch. will change it and upload when I come back, feel free to change it yourself in the meantime. [03:56] dato: fixed === sandrot [n=santuri@c-71-199-230-127.hsd1.fl.comcast.net] has joined #bzr [04:12] any ideas on how to push via sftp to a different port number [04:12] sftp://host:port/... doesn't work? [04:13] think the colon specifies the remote directory... [04:13] no, that's only in scp location specifiers [04:14] so then, sftp://me@host/directory:port [04:14] the port should be after the host, like sftp://me@host:port/directory [04:15] worked like a charm, thanks! === asabil [n=asabil@ti0035a340-0084.bb.online.no] has joined #bzr === asabil [n=asabil@ti0035a340-0084.bb.online.no] has left #bzr ["Ex-Chat"] [04:44] jelmer: you kept python-pysqlite2 unconditionally in build-depends(indep) [04:45] jelmer: I'd apply http://rafb.net/p/aPgodP42.html [04:46] dato: looks good [04:46] should I apply that patch or will you do so before upload? [04:46] jelmer: I'll do it === Jamon [n=Jamon@146-115-112-82.c3-0.lex-ubr1.sbo-lex.ma.cable.rcn.com] has joined #bzr [05:17] What are the options for bzr web interfaces? [05:18] and are there specs for figuring out how to build one from scratch? [05:20] Jamon, check out loggerhead [05:20] Jamon, see the plugins page [05:22] There is "webserve" on the plugins page. [05:22] https://launchpad.net/loggerhead/ [05:23] http://www.lag.net/loggerhead/ === cfbolz [n=cfbolz@p54AB9986.dip0.t-ipconnect.de] has joined #bzr [05:24] dato: thanks! [05:24] np [05:25] This is loggerhead in action... http://www.lag.net/branches/loggerhead/loggerhead_dev/ === Jamon waits for it to load === Jamon waaaaiiits [05:32] sheesh, this will take all day [05:32] jelmer: phanatic: Could you please merge few more fixes fro bzr-gtk from https://code.launchpad.net/~matkor/bzr-gtk/trunk-matkor ? Please take look at gannotate fix because I am not sure if it is proper. It makes gannotate work though... TIA [05:32] matkor: Thanks [05:42] "The proxy server received an invalid response from an upstream server. " [05:42] Does anyone have a loggerhead branch up for viewing? [05:44] Jamon, launchpad runs it [05:45] Jamon: Are you looking for an example of how it looks like or the source code? [05:45] How it looks [05:45] So I know if I want to use it [05:45] Jamon: http://codebrowse.launchpad.net/~mvo/apt/main [05:46] thnx [05:46] (for one example) [05:46] seanhodges_: get_apparent_author was recently added to Bazaar. [05:47] At the same time, I added it to gannotate. [05:47] Is it easy to change the style? [05:49] Oops, should have been matkor [05:49] Is it easy to read this info from the .bzr dir? Ideally I'd like to make something like this using simple PHP functions. [05:50] matkor: The Revision.get_apparent_author method was added to Bazaar recently, and I added it to gannotate at the same time. [05:51] I respectfully suggest that you're running the wrong Bazaar version;. [05:51] yeah, latest bzr-gtk needs latest bzr.dev :) [05:51] abentley: OK. You are right. I will revert that patch. Sorry for problem [05:52] I think I have to stat using trunk versoin of bzr .... [05:52] How you guys do that ? I bet you do not download snapshot, install it etc ? [05:53] matkor: you don't have to install bzr to use it [05:53] But I have to build some modules, right ? [05:53] so you can have multiple instances, and use what you want (stable for system-wide stuff, bzr.dev for testing) [05:54] How can I have trunk only for one user ? [05:55] use alias in your .bashrc [05:55] Is TracBzr any good? [05:56] Jamon: people are using it, and it works :) [05:56] I don't suppose you know of a live site using it? [05:57] Jamon: http://bugs.bitlbee.org/bitlbee/ does [05:57] phanatic: I have link ~/.bazaar/plugins/gtk -> /home/users/matkor/src/bzr-gtk/trunk-matkor/ so how to make that versionn use bzr checkout somewhere in ~ ? === jdong [n=root@ubuntu/member/jdong] has joined #bzr [05:58] matkor: sorry, i can't help here, since i'm one of the lazy bastards who installs bzr.dev system-wide :) [05:58] jelmer: Thanks. Looks like it works enough for use. [05:59] matkor: I just have an alias set in my shell called bzr.dev: [05:59] bzr.dev='PYTHONPATH=/usr/local/lib/svn-python LD_LIBRARY_PATH=/usr/local/lib BZR_PLUGIN_PATH=/home/jelmer/.bazaar/dev-plugins $HOME/bzr/bzr.dev/bzr' [05:59] you wouldn't need the PYTHONPATH or LD_LIBRARY_PATH overrides [06:00] phanatic: OK :) How you do that ? Checkout recent trunk to /usr/share/python2.4/site-packages/bzrlib ? [06:01] jelmer: but will it make olive-gtk use those bzrlib ? [06:01] matkor: if that's what you're looking for, just run: [06:01] something like: PYTHONPATH=$HOME/bzr/bzr.dev ./olive-gtk [06:02] jelmer: Yeah. That sound great thanks ! [06:02] "The most up-to-date version of trac+bzr is Aaron Bentley's multi-branch version (Bazaar Branch)" This link is empty btw [06:02] The most up-to-date version of trac+bzr is Aaron Bentley's multi-branch version (Bazaar Branch) [06:03] http://panoramicfeedback.com/opensource/trac+bzr/ [06:03] It is a Bazaar branch. === jelmer is still confused by the trac+bzr/trac-bzr stuff.. it's DVD-RW all over again [06:03] abentley: Oh so I have to use bzt to see it, ok thnx [06:03] bzr [06:04] Jamon: it's also packaged in debian and ubuntu [06:05] Hmm what's the package name for Ubuntu? [06:05] trac-bzr [06:06] Maybe it's not in dapper [06:06] gutsy is the first version in which it was present [06:06] Ok, this server is dapper. [06:07] In that case, the version of trac is also too old - trac-bzr needs at least 0.10 [06:08] Oh === abadger1999 [n=abadger1@65.78.187.68] has joined #bzr [06:11] I just need a simple way for allowing the public to download the source for websites, and submit patches. I thought Bazaar looked better than Mercurial and DARCS, but is it best for what I need? I use PHP and just need a nice web interface. [06:15] jamon: It shouldn't be too hard to install a newer trac on dapper === jrydberg_ [n=Johan@c80-216-246-123.bredband.comhem.se] has joined #bzr [06:21] http://trac.edgewall.org/wiki/TracOnUbuntu [06:26] Is it easier to upgrade to a diff ubuntu ver? :) [06:34] abentley: What do you think about supporting multiple projects in one bundlebuggy instance? [06:42] that would have some advantages (need to login only once, views with data from multiple projects, etc) [06:42] at the expense of code complexity === grimboy [n=grimboy@85-211-246-68.dsl.pipex.com] has joined #bzr [06:43] OK. Is https://code.launchpad.net/~bzr/bzr/trunk version of bazaar which I should use to develop olive-gtk ? [06:43] matkor: yes [06:49] Can one having branch with revisions r1,r2,r3 remove changes made by r2 ? [06:49] Why isn [06:49] Why isn't there something like launchpad for download? === jenda [n=jenda@freenode/staff/ubuntu.member.jenda] has left #bzr [] [07:09] Why does SCM seem so complex? How do most people do this? [07:11] Maybe giving everyone a SSH shell, and they put their branches their? [07:11] What is the standard simple method [07:12] I usually just give ssh or sftp access [07:12] ssh is better, faster [07:13] sftp is a bit more secure and easier to setup (me thinks at least :P) [07:13] Hmmm when I turned to trunk version of bzr olive-gtk seems to hang in busy loop when doing log ... [07:13] phanatic, ^_^ [07:14] bzr log works at once ... [07:14] pygi: thanks, but no need to ping, i get notified about olive and bzr-gtk related stuff automatically ;) [07:14] phanatic, shhhh! XD [07:15] matkor: it hangs for me for bzr.dev as well, but smaller trees seem to work (like bzr-gtk) [07:15] Do you guys also offer web features for your devs? Or just SSH/SFTP? [07:16] phanatic: for me it hangs in my version of bzr-gtk :/ [07:16] hmm :/ [07:21] How can I see diff of given revison ? Preferably as in olive-gtk ? [07:22] matkor: currently olive-gtk doesn't support diff between any two revisions (it's still on the todo list) [07:23] jelmer: my first reaction is that it would be messy-- both codewise and for UI. [07:24] phanatic: I was thinking about single revision view .. like bzr diff -r -2..-1 but in that usuall diff window ... [07:26] phanatic: Anyway when lp syncs pls review and apply simple push fix from https://code.launchpad.net/~matkor/bzr-gtk/trunk-matkor... TIA [07:28] matkor: i will do, thanks :) === vila [n=vila@lec67-4-82-230-53-244.fbx.proxad.net] has joined #bzr === BasicOSX [n=BasicOSX@warden.real-time.com] has joined #bzr === bigdog [n=scmikes@72-197-8-8-arpa.cust.cinci.current.net] has joined #bzr [08:08] abentley: Ok [08:09] abentley: Any chance we can have the bzr-gtk bundle buggy up on the main site somewhere? Or would you rather see it running on a different location? [08:10] It would be nice if you could host the bzr-gtk one, I don't have access to any potential hosts. [08:10] Hmm. We can try it, I guess. [08:11] how hard is it to migrate an installation? [08:11] Not hard. [08:11] I can do the basic installation and run it on one of my hosts that's not on 24/7 for now [08:11] Data is a single sqlite file. [08:11] ah, sweet [08:12] if it's becoming annoying for people that it's not available, we could talk about migrating [08:13] Yeah. [08:13] My server's a virtual machine, so it doesn't have tons of resources. You may have noticed BB is slow from time to time. [08:14] abentley, thanks, i'll update and give it a try [08:14] seanhodges_: cool. [08:19] i wonder if launchpad will ever get bundle buggy type functionality [08:20] i definitely prefer the workflow of just sending a mail via bzr send, rather than filing tickets [08:22] abentley: Ok, I'll do that then. Thanks [08:23] keir: AIUI, launchpad has rich support for creating/updating bugs by mail. [08:23] abentley: Do you perhaps know what might be causing this error: http://145.97.196.157:8089/ ? [08:24] It still doesn't support attachments (with patches, etc) to such emails [08:24] abentley, but it doesn't show nice diffs for merge directives, does it? [08:25] jelmer: I don't know the cause, but that indicates a problem loading a Kid template. [08:26] I've seen that during development with other TG projects. [08:26] keir: Sorry, I thought you were talking about the fact that BB was mail-controlled. [08:27] i have a question regarding debug prints. right now my code is littered with many extraneous prints; obviously those need to be removed. however, i've committed many times to my own branch. [08:28] if my code goes in (obviously cleaned), then those nasty print statements will still be in the history. is this a problem? [08:30] No, it's not a problem. [08:30] ok [08:30] If you're using Python, I'd recommend using "import pdb; pdb.set_trace()" instead of printing, though. [08:31] abentley, that would be true, if it was just one spot to check. however, i need to see a bunch of data at different points in the building / reading process [08:31] i do use pdb when i'm ready to poke at a particular point [08:38] abentley: it seems to complain about "" in the .kid files, which seems odd [08:38] Which Kid is this? [08:38] there are also deprecation warnings from kid - what version of python-kid do you have? [08:38] ii python-kid 0.9.6-1 simple Pythonic template language for XML ba [08:39] 0.9.5 [08:41] I just upgraded to 0.9.6 and I get those deprecation warnings, but it works. [08:46] ok, thanks - I'll keep looking === Husio [n=server@oceanic.wsisiz.edu.pl] has joined #bzr === Jamon [n=Jamon@146-115-112-82.c3-0.lex-ubr1.sbo-lex.ma.cable.rcn.com] has left #bzr [] === LaserJock [n=mantha@ubuntu/member/laserjock] has joined #bzr === zbrown [n=rufius@unaffiliated/zbrown] has joined #bzr [09:05] How stable is the bzr+eclipse plugin? === nDuff [n=ccd@fw2.isgenesis.com] has joined #bzr [09:16] Husio: did you ask you question in here? I'm interested in your question as well [09:17] my question? [09:17] those from ubuntu-devel? [09:17] yes [09:18] actually, I've got answer [09:18] but I've got also some error :) [09:18] Husio: do you just want to undo the entire merge, or "zap out" the changes represented by it? [09:19] yes [09:19] I think so [09:19] that's not a yes or no question. [09:19] that's a pick first part or the second question :) [09:19] I just wonder what you're supposed to do if say you have a merge that changes 10 files and you only want the changes from 3 [09:19] ok, so I've just merger project and then afret diff I've realized that I don't want to commit it [09:19] you commit it and then revert the 7 files you dont want? [09:20] LaserJock: persoanlly I'd just revert the 7 files, then commit [09:20] k [09:21] hm, didn't think about commiting single files.. [09:21] but you still have to dig out the stuff you *don't* want rather than the stuff you *do* want [09:21] true [09:21] if you want most of it that makes sense [09:21] but if you only want a little then it's not so fun [09:22] it probably depend on the project [09:22] well if you only want a little, it might be worth the time to cherrypick those revisions you do want.... [09:22] then merge the rest, and nullify that merge with a patch -R [09:22] how do you do that? [09:23] bzr merge -r a..b remote_branch [09:23] and then once you're done doing that and committing, do a bzr merge remote_branch, then bzr diff | patch -R, then commit [09:23] anyway, I've created some 1 file project made a few change+commit and then uncommit all the changes [09:23] I'm trying to figure out how to merge common piecies of two unrelated branches [09:23] bzr diff show all the changes but commit gives me en assert exception [09:24] jdong: why would I want to merge after cherry-picking? [09:24] LaserJock: if you intend to continue following that branch's changes, it's more convenient to merge and zap it out, so bzr doesn't continue bugging you about those revisions [09:25] the cherry-picking workflow is pretty confusing/awkward though :) [09:25] seems like that might lead to a lot of cruft [09:27] seems like there should be a way to merge subdirs [09:28] jelmer: http://bzr.debian.org/pkg-bazaar/bzr-builddeb/people/jdw/dev may be of interest [09:28] james_w, thanks, will check it out [09:29] jelmer: I'm just writing the docs, but if you can't figure it out I can give you some hints. [09:30] LaserJock: agreed, more forms of subset merging would be nice.... [09:32] can you have a branch within a branch? [09:32] james_w: Ok [09:33] LaserJock: apparently with the new format yes [09:35] New bug: #139987 in bzr "bzr send should retrieve mail-to address from submit branch" [Undecided,New] https://launchpad.net/bugs/139987 === fog [n=fog@debian/developer/fog] has joined #bzr [09:37] james_w: Works like a charm :-) [09:41] jelmer: great. I just pushed the docs, so it's your fault if it goes wrong now :). [09:41] jelmer: let me know if you are missing anything. [09:42] Anyone have thoughts on bzr clipse? [09:42] james_w: A wishlist thing that I mentioned earlier is support for $DEBIAN_VERSION in export-upstream-revision [09:42] james_w: so that I can set it to 'tag:bzr-svn-$DEBIAN_VERSION' for example [09:43] zbrown: Probably better to ask on the mailing list, none of the bzr-eclipse folks seem to be around [09:43] jelmer: ah yes. ConfigObj has interpolation support, but I'm not sure whether it will do what we want. Let me check it out. [09:44] jelmer: do you mean $UPSTREAM_VERSION? We can obviously support both. [09:44] james_w: Sorry, yes - that's what I meant [09:45] the upstream version derived from the version in debian/changelog === pmezard [n=pmezard@nor75-4-81-56-59-92.fbx.proxad.net] has joined #bzr [09:45] jelmer: yeah, I think that could be useful in hooks as well. [09:46] jeoh ok [09:46] woops, jelmer [09:47] jelmer: Ya, I'm just curious because I like bzr better than svn, and we've been using Subclipse since it makes for easy management within Eclipse since most of our devs use that. Thanks [09:47] (I get to make the calls on things like that) [09:56] jelmer: thanks for the [MERGE] . === fog [n=fog@debian/developer/fog] has joined #bzr === asak [n=alexis@201-26-116-249.dsl.telesp.net.br] has joined #bzr [10:30] jelmer: the ConfigObj in bzr is quite out of date and only support %()s interpolation. I would prefer ${} I think, so I will propose updating it. [10:34] james_w: makes sense [10:36] I would pull a copy in to builddeb, but I guess bzr can update for the next release, which is the earliest this would land in builddeb. Can you wait a little longer? === Husio [n=server@oceanic.wsisiz.edu.pl] has left #bzr [] [10:45] james_w: Yup, I'm using bzr.dev anyway === sverrej [n=sverrej@tul-1x-dhcp017.studby.uio.no] has joined #bzr === schierbeck [n=daniel@dasch.egmont-kol.dk] has joined #bzr [10:49] are there any bzr-gtk guys in here? [10:49] schierbeck, phanatic is your folk! [10:49] schierbeck: me :) [10:49] phanatic, where do you collect so much people? :P [10:49] are you breeding them? :D [10:49] wohoo! [10:50] i've just added some fixes to bzr-gtk, and have been asked to add an entry to the NEWS file [10:50] pygi: let it be my secret ;) [10:50] schierbeck: yeah, it was me :) [10:50] having never done such a thing before, i'd like to know where to place it [10:50] oh, hi phanatic :) [10:50] should i put it in the newest section? [10:51] schierbeck: i guess this kind of change should go into the 'UI' section [10:51] phanatic, evil! [10:51] you can't say things like that to your mentor :p [10:51] schierbeck: yes [10:51] phanatic: cool [10:51] pygi: :D [10:51] i was thrown off by the date stamp [10:51] :) [10:51] i'll just do that and push it to lp [10:52] schierbeck: oh wait [10:52] i was wrong... didn't notice that we don't have an UNRELEASED entry in NEWS [10:53] yup, that's what threw me off [10:53] should i create one? [10:53] yes, please... it should say "0.91.0 UNRELEASED" [10:54] and just under that, start an UI section with the description of your change, your name and bug number (see other entries for a template) [10:54] ok [10:57] phanatic: it's pushed to lp :) [10:58] schierbeck: thanks, i'll merge it tomorrow and i'll also have a look at matkor's branch... === Goshawk [n=vincenzo@81-208-106-71.ip.fastwebnet.it] has joined #bzr [10:59] hi [10:59] phanatic: cool. i'm off to sleep then, bye! [11:01] i've a problem, i did a branch of a repo and changed some things, now i wanna publish my changes upstream, but when i do bzr pull it says "No revisions to pull" and the upstream branch is not modificated [11:01] what's wrong? [11:01] i've committed and merged on my branch [11:02] I think you want 'bzr push' if you want to publish your changes, or am I misunderstanding something? [11:03] Goshawk: There are no extra revision since you branched , so nothing to pull - thats seems OK [11:03] If you want publish do "push" [11:03] ok doing push [11:05] This transport does not update the working tree of: ftp://bzr@vincenzo-ampolo.net/sites/ [11:05] and then many ftp temporary error 451 [11:06] Append/Restart not permitted, try again. Retrying. [11:06] is it a problem related with the ftp? [11:06] yes, the ftp server doesn't support appending to files [11:06] does the server support sftp? [11:07] no it's disabled but i can enable it [11:08] but that will not help you with the "This transport does not update the working tree of" issue, anyway [11:08] bzr will not update the working tree using any protocol === grimboy [n=grimboy@85-211-255-4.dsl.pipex.com] has joined #bzr [11:09] i've changed the server configuration [11:10] thanks for your help guys [11:10] works :D [11:10] This transport does not update the working tree of: ftp://bzr@vincenzo-ampolo.net/sites/ [11:10] what does it mean? [11:10] that is changed only the files inside .bzr [11:11] *it [11:11] i'm pushing my changes... so why there changes are not propagated? (looking in the upstram branch for confirms) [11:12] only the branch is propagated, that is the revision data [11:12] ah then i must do bzr update [11:12] in the upstream branch [11:12] yes, you can run 'bzr up' on the server if you have ssh access to it [11:12] cute... so there will be no unauthorized changes [11:12] there is a plugin that can do it using one command [11:13] from client? [11:13] yes - https://launchpad.net/bzr-push-and-update/ [11:14] thanks === schierbeck [n=daniel@dasch.egmont-kol.dk] has joined #bzr === yminsky [n=yminsky@user-0cevcqv.cable.mindspring.com] has joined #bzr === asak| [n=alexis@lnx00.cecm.usp.br] has joined #bzr