[12:25] <Peng> 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] <Odd_Bloke> Peng: Why?  Everyone's going to be using bzr soon enough. ;)
[12:28] <Peng> Heh.
[12:28] <Peng> Well, it would still be nice to help out those crazy Mercurial guys, then. ;)
[12:29] <Odd_Bloke> :D
[12:29] <Peng> Is Codeville's merge algorithm easily portable to other VCSes?
[12:33] <jelmer> Codeville, is that Bram Cohens' VCS?
[12:33] <Peng> Yeah.
[12:34] <Peng> I don't think it has much momentum, but it has a cool merging algorithm.
[12:34] <jelmer> Peng: See http://bramcohen.livejournal.com/37690.html
[12:35] <Peng> jelmer: Yeah, I've read it.
[12:39] <jelmer> Peng: Those implementations all make different assumptions about inputs / outputs
[12:39] <jelmer> some are line-based, some binary, etc
[12:40] <Peng> Aww.
[12:40] <Peng> bzrlib.lazy_import would be good, though.
[12:40] <Peng> mercurial.demandload is kind of yucky. It catches all imports, not just ones passed to it.
[12:40] <Peng> That does make it easier, though.
[12:40] <jelmer> Yeah, some things could definitely be shared, indeed
[12:40] <jelmer> I guess lazy_import would even be useful for non-vcs python apps
[12:41] <Peng> Yeah.
[02:01] <ubotu> New bug: #139863 in bzr-dbus "" [Undecided,New]  https://launchpad.net/bugs/139863
[09:47] <matkor> Hi !
[09:50] <matkor> Does revision: <Revision id foo@bzr-123-xxxx> should have get_apparent_author() method ?
[09:50] <matkor> For me annotate fails becouse of that
[09:51] <matkor> I see such members: 'committer', 'get_history', 'get_summary', 'inventory_sha1', 'message', 'parent_ids', 'parent_sha1s', 'properties', 'revision_id', 'timestamp', 'timezone
[09:51] <matkor> But docs say sth completly different: http://starship.python.net/crew/mwh/bzrlibapi/bzrlib.revision.Revision.html#get_apparent_author
[01:00] <dato> jelmer: do you want a bzr-svn upload?
[01:43] <matkor> 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
[01:59] <seanhodges_> hey does anyone know how to add bookmarks in the Olive GUI?
[02:00] <seanhodges_> I'm running the latest released bzr (0.90.0)
[02:48] <pygi> seanhodges_, phanatic is your folk
[02:48] <pygi> he's the olive's author
[02:48] <phanatic> morning people
[02:50] <pygi> phanatic, :
 hey does anyone know how to add bookmarks in the Olive GUI?
 I'm running the latest released bzr (0.90.0)
[02:51] <seanhodges_> hey sorry just got back
[02:52] <phanatic> 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] <seanhodges_> ah ok, i thought i was going mad ;)
[02:53] <phanatic> seanhodges_: try trunk, it shoudl work
[02:53] <phanatic> *should*
[02:53] <seanhodges_> i was about to ask that
[02:53] <seanhodges_> cool, i'll try it out and get back 2 u
[02:54] <phanatic> great :)
[02:54] <seanhodges_> 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] <phanatic> seanhodges_: they are bundled together, so the best would be to get all of bzr-gtk
[02:55] <seanhodges_> no problem, i'll do that
[02:55] <seanhodges_> thanks
[02:56] <phanatic> yw, i hope it helps
[02:56] <phanatic> pygi: thanks for pinging me :)
[02:57] <pygi> phanatic, you are welcome
[02:58] <seanhodges_> yeah thanks pygi - was definitely helpful
[03:04] <jelmer> dato: Yes, please :-)
[03:09] <seanhodges_> 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] <seanhodges_> I renamed my olive.conf but must have missed some other config files for bzr-gtk?
[03:11] <phanatic> 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] <seanhodges_> thats ok, i'll just modify it if/when i update again
[03:12] <seanhodges_> seems to be working fine now tho, thanks for your help
[03:31] <dato> jelmer: do you have an opinion on 442171?
[03:45] <jelmer> bug 442171 ?
[03:45] <jelmer> or debian bug 442171?
[03:45] <ubotu> 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] <dato> yeah, that
[03:48] <jelmer> dato: Think that'd be a good idea
[03:49] <jelmer> Assuming python-pysqlite2 depends on python :-)
[03:49] <dato> er, sure it does
[03:49] <dato> python (<< 2.6), python (>= 2.4)
[03:50] <dato> so it should be fine
[03:51] <dato> 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] <jelmer> dato: fixed
[04:12] <sandrot> any ideas on how to push via sftp to a different port number
[04:12] <jelmer> sftp://host:port/... doesn't work?
[04:13] <sandrot> think the colon specifies the remote directory...
[04:13] <jelmer> no, that's only in scp location specifiers
[04:14] <sandrot> so then, sftp://me@host/directory:port
[04:14] <jelmer> the port should be after the host, like sftp://me@host:port/directory
[04:15] <sandrot> worked like a charm, thanks!
[04:44] <dato> jelmer: you kept python-pysqlite2 unconditionally in build-depends(indep)
[04:45] <dato> jelmer: I'd apply http://rafb.net/p/aPgodP42.html
[04:46] <jelmer> dato: looks good
[04:46] <jelmer> should I apply that patch or will you do so before upload?
[04:46] <dato> jelmer: I'll do it
[05:17] <Jamon> What are the options for bzr web interfaces?
[05:18] <Jamon> and are there specs for figuring out how to build one from scratch?
[05:20] <keir> Jamon, check out loggerhead
[05:20] <keir> Jamon, see the plugins page
[05:22] <Jamon> There is "webserve" on the plugins page.
[05:22] <Jamon> https://launchpad.net/loggerhead/
[05:23] <Jamon> http://www.lag.net/loggerhead/
[05:24] <jelmer> dato: thanks!
[05:24] <dato> np
[05:25] <Jamon> This is loggerhead in action... http://www.lag.net/branches/loggerhead/loggerhead_dev/
[05:32] <Jamon> sheesh, this will take all day
[05:32] <matkor> 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] <jelmer> matkor: Thanks
[05:42] <Jamon> "The proxy server received an invalid response from an upstream server. "
[05:42] <Jamon> Does anyone have a loggerhead branch up for viewing?
[05:44] <jelmer> Jamon, launchpad runs it
[05:45] <jelmer> Jamon: Are you looking for an example of how it looks like or the source code?
[05:45] <Jamon> How it looks
[05:45] <Jamon> So I know if I want to use it
[05:45] <dato> Jamon: http://codebrowse.launchpad.net/~mvo/apt/main
[05:46] <Jamon> thnx
[05:46] <dato> (for one example)
[05:46] <abentley> seanhodges_: get_apparent_author was recently added to Bazaar.
[05:47] <abentley> At the same time, I added it to gannotate.
[05:47] <Jamon> Is it easy to change the style?
[05:49] <abentley> Oops, should have been matkor
[05:49] <Jamon> 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] <abentley> matkor: The Revision.get_apparent_author method was added to Bazaar recently, and I added it to gannotate at the same time.
[05:51] <abentley> I respectfully suggest that you're running the wrong Bazaar version;.
[05:51] <phanatic> yeah, latest bzr-gtk needs latest bzr.dev :)
[05:51] <matkor> abentley: OK. You are right. I will revert that patch. Sorry for problem
[05:52] <matkor> I think I have to stat using trunk versoin of bzr ....
[05:52] <matkor> How you guys do that ? I bet you do not download snapshot, install it etc ?
[05:53] <phanatic> matkor: you don't have to install bzr to use it
[05:53] <matkor> But I have to build some modules, right ?
[05:53] <phanatic> so you can have multiple instances, and use what you want (stable for system-wide stuff, bzr.dev for testing)
[05:54] <matkor> How can I have trunk only for one user ?
[05:55] <phanatic> use alias in your .bashrc
[05:55] <Jamon> Is TracBzr any good?
[05:56] <phanatic> Jamon: people are using it, and it works :)
[05:56] <Jamon> I don't suppose you know of a live site using it?
[05:57] <jelmer> Jamon: http://bugs.bitlbee.org/bitlbee/ does
[05:57] <matkor> 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 ~ ?
[05:58] <phanatic> matkor: sorry, i can't help here, since i'm one of the lazy bastards who installs bzr.dev system-wide :)
[05:58] <Jamon> jelmer: Thanks. Looks like it works enough for use.
[05:59] <jelmer> matkor: I just have an alias set in my shell called bzr.dev:
[05:59] <jelmer> 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] <jelmer> you wouldn't need the PYTHONPATH or LD_LIBRARY_PATH overrides
[06:00] <matkor> phanatic: OK :) How you do that ? Checkout recent trunk to /usr/share/python2.4/site-packages/bzrlib ?
[06:01] <matkor> jelmer: but will it make olive-gtk use those bzrlib ?
[06:01] <jelmer> matkor: if that's what you're looking for, just run:
[06:01] <jelmer> something like: PYTHONPATH=$HOME/bzr/bzr.dev ./olive-gtk
[06:02] <matkor> jelmer: Yeah. That sound great thanks !
[06:02] <Jamon> "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] <Jamon> The most up-to-date version of trac+bzr is Aaron Bentley's multi-branch version  (Bazaar Branch)
[06:03] <Jamon> http://panoramicfeedback.com/opensource/trac+bzr/
[06:03] <abentley> It is a Bazaar branch.
[06:03] <Jamon> abentley: Oh so I have to use bzt to see it, ok thnx
[06:03] <Jamon> bzr
[06:04] <jelmer> Jamon: it's also packaged in debian and ubuntu
[06:05] <Jamon> Hmm what's the package name for Ubuntu?
[06:05] <jelmer> trac-bzr
[06:06] <Jamon> Maybe it's not in dapper
[06:06] <jelmer> gutsy is the first version in which it was present
[06:06] <Jamon> Ok, this server is dapper.
[06:07] <jelmer> In that case, the version of trac is also too old - trac-bzr needs at least 0.10
[06:08] <Jamon> Oh
[06:11] <Jamon> 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] <jelmer> jamon: It shouldn't be too hard to install a newer trac on dapper
[06:21] <Jamon> http://trac.edgewall.org/wiki/TracOnUbuntu
[06:26] <Jamon> Is it easier to upgrade to a diff ubuntu ver? :)
[06:34] <jelmer> abentley: What do you think about supporting multiple projects in one bundlebuggy instance?
[06:42] <jelmer> that would have some advantages (need to login only once, views with data from multiple projects, etc)
[06:42] <jelmer> at the expense of code complexity
[06:43] <matkor> OK. Is https://code.launchpad.net/~bzr/bzr/trunk version of bazaar which I should use to develop olive-gtk ?
[06:43] <phanatic> matkor: yes
[06:49] <matkor> Can one having branch with revisions r1,r2,r3  remove changes made by r2 ?
[06:49] <Jamon> Why isn
[06:49] <Jamon> Why isn't there something like launchpad for download?
[07:09] <Jamon> Why does SCM seem so complex? How do most people do this?
[07:11] <Jamon> Maybe giving everyone a SSH shell, and they put their branches their?
[07:11] <Jamon> What is the standard simple method
[07:12] <jdong> I usually just give ssh or sftp access
[07:12] <pygi> ssh is better, faster
[07:13] <pygi> sftp is a bit more secure and easier to setup (me thinks at least :P)
[07:13] <matkor> Hmmm when I turned to trunk version of bzr olive-gtk seems to hang in busy loop when doing log ...
[07:13] <pygi> phanatic, ^_^
[07:14] <matkor> bzr log works at once ...
[07:14] <phanatic> pygi: thanks, but no need to ping, i get notified about olive and bzr-gtk related stuff automatically ;)
[07:14] <pygi> phanatic, shhhh! XD
[07:15] <phanatic> matkor: it hangs for me for bzr.dev as well, but smaller trees seem to work (like bzr-gtk)
[07:15] <Jamon> Do you guys also offer web features for your devs? Or just SSH/SFTP?
[07:16] <matkor> phanatic: for me it hangs in my version of bzr-gtk :/
[07:16] <phanatic> hmm :/
[07:21] <matkor> How can I see diff of given revison ? Preferably as in olive-gtk ?
[07:22] <phanatic> matkor: currently olive-gtk doesn't support diff between any two revisions (it's still on the todo list)
[07:23] <abentley> jelmer: my first reaction is that it would be messy-- both codewise and for UI.
[07:24] <matkor> phanatic: I was thinking about single revision view .. like  bzr diff -r -2..-1  but in that usuall diff window ...
[07:26] <matkor> 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] <phanatic> matkor: i will do, thanks :)
[08:08] <jelmer> abentley: Ok
[08:09] <jelmer> 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] <jelmer> It would be nice if you could host the bzr-gtk one, I don't have access to any potential hosts.
[08:10] <abentley> Hmm.  We can try it, I guess.
[08:11] <jelmer> how hard is it to migrate an installation?
[08:11] <abentley> Not hard.
[08:11] <jelmer> I can do the basic installation and run it on one of my hosts that's not on 24/7 for now
[08:11] <abentley> Data is a single sqlite file.
[08:11] <jelmer> ah, sweet
[08:12] <jelmer> if it's becoming annoying for people that it's not available, we could talk about migrating
[08:13] <abentley> Yeah.
[08:13] <abentley> 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] <seanhodges_> abentley, thanks, i'll update and give it a try
[08:14] <abentley> seanhodges_: cool.
[08:19] <keir> i wonder if launchpad will ever get bundle buggy type functionality
[08:20] <keir> i definitely prefer the workflow of just sending a mail via bzr send, rather than filing tickets
[08:22] <jelmer> abentley: Ok, I'll do that then. Thanks
[08:23] <abentley> keir: AIUI, launchpad has rich support for creating/updating bugs by mail.
[08:23] <jelmer> abentley: Do you perhaps know what might be causing this error: http://145.97.196.157:8089/ ?
[08:24] <jelmer> It still doesn't support attachments (with patches, etc) to such emails
[08:24] <keir> abentley, but it doesn't show nice diffs for merge directives, does it?
[08:25] <abentley> jelmer: I don't know the cause, but that indicates a problem loading a Kid template.
[08:26] <abentley> I've seen that during development with other TG projects.
[08:26] <abentley> keir: Sorry, I thought you were talking about the fact that BB was mail-controlled.
[08:27] <keir> 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] <keir> if my code goes in (obviously cleaned), then those nasty print statements will still be in the history. is this a problem?
[08:30] <abentley> No, it's not a problem.
[08:30] <keir> ok
[08:30] <abentley> If you're using Python, I'd recommend using "import pdb; pdb.set_trace()" instead of printing, though.
[08:31] <keir> 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] <keir> i do use pdb when i'm ready to poke at a particular point
[08:38] <jelmer> abentley: it seems to complain about "<?python ?>" in the .kid files, which seems odd
[08:38] <abentley> Which Kid is this?
[08:38] <jelmer> there are also deprecation warnings from kid - what version of python-kid do you have?
[08:38] <jelmer> ii  python-kid     0.9.6-1        simple Pythonic template language for XML ba
[08:39] <abentley> 0.9.5
[08:41] <abentley> I just upgraded to 0.9.6 and I get those deprecation warnings, but it works.
[08:46] <jelmer> ok, thanks - I'll keep looking
[09:05] <zbrown> How stable is the bzr+eclipse plugin?
[09:16] <LaserJock> Husio: did you ask you question in here? I'm interested in your question as well
[09:17] <Husio> my question?
[09:17] <Husio> those from ubuntu-devel?
[09:17] <LaserJock> yes
[09:18] <Husio> actually, I've got answer
[09:18] <Husio> but I've got also some error :)
[09:18] <jdong> Husio: do you just want to undo the entire merge, or "zap out" the changes represented by it?
[09:19] <Husio> yes
[09:19] <Husio> I think so
[09:19] <jdong> that's not a yes or no question.
[09:19] <jdong> that's a pick first part or the second question :)
[09:19] <LaserJock> 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] <Husio> ok, so I've just merger project and then afret diff I've realized that I don't want to commit it
[09:19] <LaserJock> you commit it and then revert the 7 files you dont want?
[09:20] <jdong> LaserJock: persoanlly I'd just revert the 7 files, then commit
[09:20] <LaserJock> k
[09:21] <Husio> hm, didn't think about commiting single files..
[09:21] <LaserJock> but you still have to dig out the stuff you *don't* want rather than the stuff you *do* want
[09:21] <jdong> true
[09:21] <LaserJock> if you want most of it that makes sense
[09:21] <LaserJock> but if you only want a little then it's not so fun
[09:22] <Husio> it probably depend on the project
[09:22] <jdong> well if you only want a little, it might be worth the time to cherrypick those revisions you do want....
[09:22] <jdong> then merge the rest, and nullify that merge with a patch -R
[09:22] <LaserJock> how do you do that?
[09:23] <jdong> bzr merge -r a..b remote_branch
[09:23] <jdong> 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] <Husio> anyway, I've created some 1 file project made a few change+commit and then uncommit all the changes
[09:23] <LaserJock> I'm trying to figure out how to merge common piecies of two unrelated branches
[09:23] <Husio> bzr diff show all the changes but commit gives me en assert exception
[09:24] <LaserJock> jdong: why would I want to merge after cherry-picking?
[09:24] <jdong> 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] <jdong> the cherry-picking workflow is pretty confusing/awkward though :)
[09:25] <LaserJock> seems like that might lead to a lot of cruft
[09:27] <LaserJock> seems like there should be a way to merge subdirs
[09:28] <james_w> jelmer: http://bzr.debian.org/pkg-bazaar/bzr-builddeb/people/jdw/dev may be of interest
[09:28] <jelmer> james_w, thanks, will check it out
[09:29] <james_w> jelmer: I'm just writing the docs, but if you can't figure it out I can give you some hints.
[09:30] <jdong> LaserJock: agreed, more forms of subset merging would be nice....
[09:32] <LaserJock> can you have a branch within a branch?
[09:32] <jelmer> james_w: Ok
[09:33] <jdong> LaserJock: apparently with the new format yes
[09:35] <ubotu> New bug: #139987 in bzr "bzr send should retrieve mail-to address from submit branch" [Undecided,New]  https://launchpad.net/bugs/139987
[09:37] <jelmer> james_w: Works like a charm :-)
[09:41] <james_w> jelmer: great. I just pushed the docs, so it's your fault if it goes wrong now :).
[09:41] <james_w> jelmer: let me know if you are missing anything.
[09:42] <zbrown> Anyone have thoughts on bzr clipse?
[09:42] <jelmer> james_w: A wishlist thing that I mentioned earlier is support for $DEBIAN_VERSION in export-upstream-revision
[09:42] <jelmer> james_w: so that I can set it to 'tag:bzr-svn-$DEBIAN_VERSION' for example
[09:43] <jelmer> zbrown: Probably better to ask on the mailing list, none of the bzr-eclipse folks seem to be around
[09:43] <james_w> 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] <james_w> jelmer: do you mean $UPSTREAM_VERSION? We can obviously support both.
[09:44] <jelmer> james_w: Sorry, yes - that's what I meant
[09:45] <jelmer> the upstream version derived from the version in debian/changelog
[09:45] <james_w> jelmer: yeah, I think that could be useful in hooks as well.
[09:46] <zbrown> jeoh ok
[09:46] <zbrown> woops, jelmer
[09:47] <zbrown> 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] <zbrown> (I get to make the calls on things like that)
[09:56] <james_w> jelmer: thanks for the [MERGE] .
[10:30] <james_w> 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] <jelmer> james_w: makes sense
[10:36] <james_w> 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?
[10:45] <jelmer> james_w: Yup, I'm using bzr.dev anyway
[10:49] <schierbeck> are there any bzr-gtk guys in here?
[10:49] <pygi> schierbeck, phanatic is your folk!
[10:49] <phanatic> schierbeck: me :)
[10:49] <pygi> phanatic, where do you collect so much people? :P
[10:49] <pygi> are you breeding them? :D
[10:49] <schierbeck> wohoo!
[10:50] <schierbeck> i've just added some fixes to bzr-gtk, and have been asked to add an entry to the NEWS file
[10:50] <phanatic> pygi: let it be my secret ;)
[10:50] <phanatic> schierbeck: yeah, it was me :)
[10:50] <schierbeck> having never done such a thing before, i'd like to know where to place it
[10:50] <schierbeck> oh, hi phanatic :)
[10:50] <schierbeck> should i put it in the newest section?
[10:51] <phanatic> schierbeck: i guess this kind of change should go into the 'UI' section
[10:51] <pygi> phanatic, evil!
[10:51] <pygi> you can't say things like that to your mentor :p
[10:51] <phanatic> schierbeck: yes
[10:51] <schierbeck> phanatic: cool
[10:51] <phanatic> pygi: :D
[10:51] <schierbeck> i was thrown off by the date stamp
[10:51] <schierbeck> :)
[10:51] <schierbeck> i'll just do that and push it to lp
[10:52] <phanatic> schierbeck: oh wait
[10:52] <phanatic> i was wrong... didn't notice that we don't have an UNRELEASED entry in NEWS
[10:53] <schierbeck> yup, that's what threw me off
[10:53] <schierbeck> should i create one?
[10:53] <phanatic> yes, please... it should say "0.91.0 UNRELEASED"
[10:54] <phanatic> 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] <schierbeck> ok
[10:57] <schierbeck> phanatic: it's pushed to lp :)
[10:58] <phanatic> schierbeck: thanks, i'll merge it tomorrow and i'll also have a look at matkor's branch...
[10:59] <Goshawk> hi
[10:59] <schierbeck> phanatic: cool. i'm off to sleep then, bye!
[11:01] <Goshawk> 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] <Goshawk> what's wrong?
[11:01] <Goshawk> i've committed and merged on my branch
[11:02] <luks> I think you want 'bzr push' if you want to publish your changes, or am I misunderstanding something?
[11:03] <matkor> Goshawk: There are no extra revision since you branched , so nothing to pull - thats seems OK
[11:03] <matkor> If you want publish do "push"
[11:03] <Goshawk> ok doing push
[11:05] <Goshawk> This transport does not update the working tree of: ftp://bzr@vincenzo-ampolo.net/sites/
[11:05] <Goshawk> and then many ftp temporary error 451
[11:06] <Goshawk> Append/Restart not permitted, try again. Retrying.
[11:06] <Goshawk> is it a problem related with the ftp?
[11:06] <luks> yes, the ftp server doesn't support appending to files
[11:06] <luks> does the server support sftp?
[11:07] <Goshawk> no it's disabled but i can enable it
[11:08] <luks> but that will not help you with the "This transport does not update the working tree of" issue, anyway
[11:08] <luks> bzr will not update the working tree using any protocol
[11:09] <Goshawk> i've changed the server configuration
[11:10] <Goshawk> thanks for your help guys
[11:10] <Goshawk> works :D
[11:10] <Goshawk> This transport does not update the working tree of: ftp://bzr@vincenzo-ampolo.net/sites/
[11:10] <Goshawk> what does it mean?
[11:10] <luks> that is changed only the files inside .bzr
[11:11] <luks> *it
[11:11] <Goshawk> i'm pushing my changes... so why there changes are not propagated? (looking in the upstram branch for confirms)
[11:12] <luks> only the branch is propagated, that is the revision data
[11:12] <Goshawk> ah then i must do bzr update
[11:12] <Goshawk> in the upstream branch
[11:12] <luks> yes, you can run 'bzr up' on the server if you have ssh access to it
[11:12] <Goshawk> cute... so there will be no unauthorized changes
[11:12] <luks> there is a plugin that can do it using one command
[11:13] <Goshawk> from client?
[11:13] <luks> yes - https://launchpad.net/bzr-push-and-update/
[11:14] <Goshawk> thanks