[01:21] <Odd_Bloke> beuno: Would a fix for https://bugs.edge.launchpad.net/bzr/+bug/116377 fit in with your plugin work?
[01:21] <ubotu> Launchpad bug 116377 in bzr-gtk "Output spam when a plugin is out of date" [Undecided,Fix released]
[01:23] <exarkun> What's this?  bzr: ERROR: Cannot lock LockDir(http://bazaar.launchpad.net/%7Eexarkun/pyopenssl/trunk/.bzr/repository/lock): Transport operation not possible: http does not support mkdir()
[01:25] <Odd_Bloke> exarkun: Hi. :)  That probably means you've done a checkout of a branch over HTTP, and have tried to perform an operation that requires write-access to the remote branch.
[01:26] <nekohayo> hello folks, does anyone have links/documentation/tutorials on how to do backporting fixes, and how to do cherry-picking?
[01:26] <Odd_Bloke> You _probably_ didn't mean to do a checkout, but instead a branch.  Doing a 'bzr unbind' will remove the binding between your local branch and the remote one.
[01:28] <beuno> Odd_Bloke: I'm not sure what kind of fix that would be. It just seemed bzr-gtk doing the wrong thing to me
[01:28] <jelmer> Odd_Bloke,beuno: That bug has already been fixed, btw
[01:29] <Odd_Bloke> jelmer, beuno: Sure, I'm talking about the bzr side of things that is discussed in the bug.
[01:29] <Odd_Bloke> And there's talk of plugin metadata &c. so a little lightbulb went off. :p
[01:29] <beuno> Odd_Bloke: right, there might be something to do there, yes
[01:29] <beuno> I'll asign it to me
[01:30] <beuno> thanks  :D
[01:30] <beuno> oooooor
[01:30] <beuno> wel
[01:30] <beuno> well, lifeless already has it, and it's incomplete
[01:30] <beuno> but I'll take it into account
[01:30] <beuno> I
[01:31] <beuno> argh
[01:31] <beuno> I'm off to bed
[01:31] <Odd_Bloke> nekohayo: To perform a cherrypick, use 'bzr merge -rx..y <branch>'.  Just be aware that bzr's cherry-picking support isn't fantastic. :)
[01:31] <Odd_Bloke> nekohayo: As for backporting fixes, ISTR some discussion of it a while ago.  Let me have a think/poke around for something.
[01:34] <nekohayo> Odd_Bloke: whaddya mean by "not fantastic"? (note: I'm a VCS newbie. I came from SVN, I did not even know what a branch/merge was all 'bout)
[01:36] <jelmer> awilkins: thanks
[01:37] <Odd_Bloke> nekohayo: Basically, we don't keep track of as much metadata as we eventually will.
[01:38] <Odd_Bloke> But, TBH, I don't really know what the practical effects of that are ATM.
[01:38] <jelmer> nekohayo: bzr's support is as worse as svn's at the moment
[01:38] <jelmer> s/worse/bad/
[01:42] <Odd_Bloke> nekohayo: So, I can't really find the stuff I was referring to before.  You might be best off firing a mail to the mailing list asking for advice. :)
[01:43] <Odd_Bloke> jelmer: I tried to subscribe to the bzr-gtk list during the sprint and haven't received any sort of confirmation.  Any ideas what might be going on with that?
[01:43] <Odd_Bloke> Where confirmation also includes list emails. :p
[01:44] <jelmer> Odd_Bloke: I didn't see any confirmation note so you're definitely not on the list yet
[01:44] <jelmer> Odd_Bloke: The list is all canonical-hosted though, so there's not much more I can tell you
[01:44] <jelmer> Odd_Bloke: Have you tried subscribing again
[01:44] <Odd_Bloke> jelmer: I was about to. :)
[01:45] <Odd_Bloke> I have just done so, in fact. :p
[02:30] <piedoggie> got a Q about merges
[02:31] <piedoggie> had a conflict and now have files ending in BASE, OTHER, THIS
[02:33] <Odd_Bloke> piedoggie: That's not a question so much as it is a statement. :)
[02:34] <piedoggie> :-)  distracted by torchwood
[02:35] <piedoggie> need pointer on what these files are and how to resolve conflicts
[02:37] <Odd_Bloke> piedoggie: Well, when bzr merges, it uses three files: the file from the base revision (the revision that the two versions of the file both descend from), the file from the other branch being merged, and the file from the branch in which the merge is being performed.
[02:37] <piedoggie> right
[02:37] <Odd_Bloke> So each one of those files is one of those versions.
[02:38] <Odd_Bloke> However, if you edit the file itself (i.e. if you have foo.BASE and friends, foo) you should see some conflict markers which show you where the conflict was.
[02:38] <Odd_Bloke> The conflict markers will be a lot of '<'s, '='s or '>'s (one line of each per conflict).
[02:40] <piedoggie> k  (btw, bzr is one a very few pieces of sw that does not make me swear violently on a regular basis)
[02:43] <piedoggie> so just edit foo and use the other for reference?  then use 'bzr resolved foo' to clena up?
[02:45] <Odd_Bloke> piedoggie: Yeah, that's basically it.
[02:45] <RAOF> piedoggie: Or even just "bzr resolve".  It should be smart enough to notice that you've resolved the conflicts.
[02:46] <piedoggie> cool.  simple and works
[03:24] <nekohayo> I had that question in mind for a long time, too.
[03:24] <nekohayo> just about figured out a few days/weeks ago.
[03:25] <nekohayo> having 3 files for this is a tad confusing to me, oh well, once I figured out how to do it with Meld...
[04:14] <mwhudson__> this is a bit strange: http://paste.ubuntu-nl.org/58952/
[10:12] <dereine> i work local with files, then i want to push it to a sftp:// site, but the 2 directorys are not the same, is this normal?
[10:36] <hmeland> In what way are the directories "not the same"?  "bzr push" will only update stuff under $target_dir/.bzr/, i.e. it will not update the working tree files.
[10:37] <hmeland> If you need to update the working tree files, you will typically need shell access on the destination site.
[10:38] <hmeland> I've heard rumours that a plugin that extends "bzr push"'s functionality to also update the working tree files is in the works.
[10:42] <asabil> hmeland: push-and-update is the name of the plugin
[10:44] <hmeland> The plugin I heard rumours of sounded like it wouldn't need shell access on the target site.
[10:46] <dereine> hmeland: i have shell access on the site
[10:47] <dereine> how can i update the working tree files
[10:51] <asabil> dereine: by hand ? just ssh, and issue bzr update
[10:52] <dereine> ah ok thx
[10:52] <asabil> dereine: but why would you need a tree there ?
[10:52] <asabil> if it is for web access, I would suggest running loggerhead
[10:52] <dereine> because it's the "live"site
[10:52] <asabil> oO ?
[10:53] <asabil> not sure I got it
[10:53] <asabil> you are pushing a website using bzr ?
[10:53] <dereine> i develop a theme and some modules of a website offline and than a want to push&update the dir there
[10:53] <dereine> it's a cms
[10:53] <asabil> ah ok, I see
[12:22] <jelmer> hmm
[12:22] <jelmer> my blog is the first hit for the term "Mercurial branches" in google?
[12:25] <LarstiQ> heh
[12:29] <davi> Is there a GNU Project controlled alternative to the Canonical's Launchpad free service?
[12:31] <Toksyuryel> davi: Savanah iirc
[12:31] <davi> great!
[12:33] <davi> Toksyuryel, so why projects use Launchpad? What advantage does Launchpad offer?
[12:34] <jelmer> davi: it has tighter bzr integration
[12:34] <jelmer> if you use "bzr commit --fixes lp:<bugnumer>" launchpad will automatically link the branch and the bug report
[12:34] <jelmer> for example
[12:35] <davi> I see, Savannah should catch up
[12:35] <Toksyuryel> bazaar is developed by cannonical, who also develop launchpad. also it was only a few weeks ago that bazaar became a GNU project, so the launchpad stuff is far more mature in terms of integration
[12:35] <Toksyuryel> someone'll probably start implimenting savanah integration sooner or later
[12:36] <davi> thanks Toksyuryel
[12:36] <Toksyuryel> more likely to be someone from GNU than someone from canonical though
[12:37] <Toksyuryel> I am still concerned about the logistics of this new arrangement tbh
[12:38] <Toksyuryel> I started reading through the GNU coding guidelines and one of the first things it says that you can't "refer" to non-free projects, which has me worried about the future of the launchpad integration unless they decide to finally release it to us
[12:40] <Bronger> Well Mailman is also integrated heavily into non-free software ...
[12:41] <Toksyuryel> if the launchpad stuff is all in a plug-in that'd allieviate any concerns I think
[12:41]  * Toksyuryel knows he spelled THAT wrong...
[12:43] <Toksyuryel> jelmer: can that syntax support commits that fix multiple bugs at once?
[12:43] <jelmer> Toksyuryel: afaik, yes
[12:43] <jelmer> but I have to admit I've never used it that way
[12:43] <Toksyuryel> cool
[12:45] <Toksyuryel> if you're coding carefully it rarely happens but sometimes you get a little ahead of yourself
[12:45] <Toksyuryel> it's one of those things that it's nice to know it's there :)
[12:48] <beuno> Toksyuryel, I suppose you can file a question in Launchpad, and, if not, it will be converted into a wishlist bug
[12:49] <jelmer> 'morning beuno
[12:50] <beuno> mornin' jelmer, how's it going?
[12:50] <Toksyuryel> beuno: jelmer says it already exists?
[12:51] <Toksyuryel> *said
[12:51]  * Toksyuryel ponders how food that's never been in the freezer can be freezerburned
[12:52] <beuno> Toksyuryel, ah, I wasn't convinced by his answer  :p
[12:53] <jelmer> Toksyuryel: as beuno says, if you would like to be sure, please file a question
[12:53] <jelmer> beuno: pretty good, thanks. I'm trying to get bzr-svn up and ready for a release.
[12:53] <Toksyuryel> I'll check the docs first and if it's not in there then I'll think about filing a question :)
[12:54] <jelmer> beuno: Are you guys still around in London or now somewhere else?
[12:55] <beuno> jelmer, we're in Prague now
[12:56] <beuno> London is too expensive
[12:56] <phanatic> :)
[12:57] <phanatic> especially if you don't get per diem from canonical ;)
[12:57] <beuno> jelmer, I'm going to work on the nautilus bit today so we can see if it's in a releaseble state
[12:57] <jelmer> ah, cool
[12:57] <beuno> hey phanatic!   yeah, or a nice hotel with slippers
[12:58] <phanatic> hey beuno :)
[12:59] <phanatic> btw i couldn't get the nautilus stuff working on my hardy box. i must have missed something...
[12:59] <beuno> phanatic, would be interesting to debug that
[13:00] <phanatic> beuno: oki, i'll fire up the machine
[13:01] <LarstiQ> gar massive filesystem corruption :(
[13:08] <leo2007> hi there
[13:09] <LarstiQ> hi leo2007
[13:20] <phanatic> beuno: i've installed nautilus-bzr.py to /usr/lib/nautilus/extensions-1.0/python/ - it should be correct, but doesn't seem to work even after a reboot (emblems are available tho).
[13:25] <jelmer> phanatic: Do you have python-nautilus and python-dev installed?
[13:25] <phanatic> jelmer: i have python-nautilus installed, but not sure about python-dev. will check...
[13:28] <dereine> is it able to "push" for a older version of bzr?
[13:29] <beuno> jelmer, is there a way around the py-dev thing?
[13:29] <jelmer> beuno: Well, you can create a symlink yourself
[13:29] <jelmer> but basically, it's a bug in the python-nautilus package
[13:29] <beuno> dereine, _to_ an old version, or _from_ an old version?
[13:29] <dereine> to an old version
[13:29] <beuno> dereine, yeap, no problems doing that
[13:29] <dereine> thx
[13:29] <dereine> but who?
[13:30] <beuno> whi?
[13:30] <beuno> er, who?
[13:30] <jelmer> bug 44704
[13:30] <dereine> but how, sry i'm german
[13:30] <jelmer> ubotu: bug 44704
[13:32] <beuno> but #44704
[13:32] <beuno> argh, I can't type today
[13:33] <beuno> phanatic, did installing python-dev work?
[13:35] <jelmer> ubotu appears to be dead today
[13:35] <beuno> I went on looked it up
[13:35] <Kamping_Kaiser> he was tehre not long ago
[13:36] <Kamping_Kaiser> ubotu, ping
[13:36] <beuno> jelmer, maybe we should symlink for the time being, from install?
[13:36] <jelmer> beuno: I'd rather not - people who install python-dev would then get conflicts, etc
[13:36] <jelmer> beuno: I'd rather just get that bug fixed, it's been open for ages
[13:37] <beuno> jelmer, so we should just patch the package than?
[13:37] <beuno> we're too late for hardy though  :(
[13:37] <dereine> so how can i push as a old version of bzr
[13:38] <beuno> dereine, bzr will push with the format that the remote repo has, so it will do it automtically
[13:38] <dereine> ah ok thx
[13:39] <phanatic> installed python-dev, still haven't appeared in nautilus
[13:40] <leo2007> how to convert a project under svn to bzr?
[13:43] <beuno> leo2007, there is a bzr-svn plugin to do so
[13:56] <LarstiQ> dato: I didn't see a way to comment on your blogpost, but bzr can do that too, although the syntax could admittedly be nicer: '(?!debian/).*'
[13:56] <dato> LarstiQ: oh, wow
[13:57] <LarstiQ> oh
[13:57] <LarstiQ> you might want to prefix with RE:
[13:57] <dato> wow, I didn't know about that
[13:58] <LarstiQ> so, echo 'RE:(?!debian/).*' > .bzrignore
[13:58] <ubotu> Launchpad bug 44704 in nautilus-python "Expects to find libpython2.4.so, should look for libpython2.4.so.1" [Low,Confirmed] https://launchpad.net/bugs/44704
[13:58] <dato> LarstiQ: thank you, I'll update the entry.
[13:58] <LarstiQ> dato: it's python regexes under the hood, but without RE: it will treat it as zshish globs
[13:58] <ubotu> ping yourself ;-) really the diodes all down my left side are sore
[13:59]  * LarstiQ looks for the zsh aspects of it
[13:59] <dereine> how do i update a dir which has only some files, but on the push goal there are much more files
[13:59] <LarstiQ> I know we discussed things like **/ in the past
[13:59] <LarstiQ> dato: it's certainly at least sh globs ;)
[14:00] <dato> and RE: can have any python stuff?
[14:00] <LarstiQ> dato: python regexes
[14:00] <LarstiQ> not python code
[14:00] <dato> yeah, I meant that
[14:00] <dato> ok
[14:00] <LarstiQ> in that case, yes
[14:00] <LarstiQ> I don't know we document that well enough?
[14:01] <LarstiQ> ah, bzr help ignore lists an example of RE:
[14:01] <LarstiQ> dato: mind writing up a patch to extend the ignore help with your debian example?
[14:02] <dato> ok
[14:02]  * LarstiQ continues whipping nested-trees in shape
[14:03] <jelmer> LarstiQ: \o/
[14:19] <Verterok> moin
[14:19] <Verterok> jelmer: thanks for the review ;)
[14:20] <dereine> what is "–create-prefix" for?
[14:21] <LarstiQ> dereine: akin to mkdir -p
[14:21] <phanatic> jelmer: installed python-dev, but still can't see any bazaar actions turning up in nautilus
[14:21] <jelmer> phanatic: Try running nautilus manually
[14:21] <jelmer> it may spit out something on the command-line
[14:22] <LarstiQ> dereine: so if the directory structure you want doesn't exist at the remote side, --create-prefix will create the missing bits.
[14:22] <phanatic> jelmer: it doesn't spit out anything unfortunately. is there a switch for this maybe?
[14:22] <jelmer> phanatic: No, afaik it should spit out information by default
[14:22] <jelmer> phanatic: Are you sure you installed it in the right directory?
[14:23] <jelmer> Verterok: You're welcome. Hopefully one of the other voters can also approve it (but I guess it will not before monday)
[14:23] <jelmer> *be before
[14:23] <phanatic> jelmer: it returns to the shell after i launch nautilus manually
[14:23] <jelmer> phanatic: you need to kill the running instance of nautilus first
[14:23] <jelmer> phanatic: nautilus --quit
[14:23] <dereine> another question whats the diference between update and upgrade
[14:24] <jelmer> dereine: upgrade upgrades the branch to another file format
[14:24] <dereine> and update?
[14:24] <jelmer> dereine: update updates to the tip of the master branch (for checkouts)
[14:24] <phanatic> jelmer: i've restarted my machine twice...
[14:24] <jelmer> phanatic: yes, but that will not show anything on the command-line
[14:24] <phanatic> i have nautilus-bzr.py in /usr/lib/nautilus/extensions-1.0/python/
[14:25] <beuno> phanatic, nautilus --quit && nautilus --no-desktop
[14:25] <phanatic> jelmer: killing nautilus doesn't help either (it relaunches itself, again no output)
[14:25] <phanatic> beuno: thanks, i was looking for that :)
[14:25] <jelmer> phanatic: see beuno's comment
[14:25] <Verterok> jelmer: sure, but in the meantime I can improve it with your and other voters comments
[14:26] <phanatic> nice, it couldn't load python-nautilus
[14:26] <dereine> i have on one (1) branch much more files than on the other(2);  when i push(1) to (2) and update (2) , the dirs of (2) get moved to .moved
[14:27] <beuno> dereine, you have conflicts
[14:28] <dereine> yes but the conflict is that there are much more file than on the branch i update
[14:28] <beuno> dereine, right, if you keep pushing and updateing without resolving, you will just generate more .moved files
[14:32] <phanatic> it seems i won't be able to test under hardy. i get an undefined symbol error when loading nautilus-python
[14:33] <phanatic> oh, the same error that's described in the debian bts
[14:35] <dereine> beuno: but resolve does nothing
[14:35] <dereine> do i need to have the same startpoint for both branches?
[14:35] <beuno> dereine, take a look at: http://doc.bazaar-vcs.org/latest/en/user-guide/index.html#resolving-conflicts
[15:44] <ubotu> New bug: #200203 in bzr-svn "branch using bzr-svn just hangs" [Undecided,Fix released] https://launchpad.net/bugs/200203
[15:54] <Odd_Bloke> Afternoon.
[16:18] <jelmer> any turbogears experts here?
[16:25] <manfre> how do i change the push location of an existing branch?
[16:25] <beuno>  manfre you can just do a push to the new location with --remember
[16:25] <manfre> ok
[16:25] <beuno> and it will override the default
[16:26] <manfre> thanks...that worked
[16:27] <beuno> manfre, you're welcome
[16:53] <j1mc> hi all - i used sed to create a working copy of a file (file_temp.xml) and then used mv to overwrite file.xml with file_temp.xml.  ...
[16:53] <j1mc> when i do a bzr status, there's an asterisk after file.xml... does this mean it can't do a diff anymore?
[16:55] <j1mc> (or that the diff won't be accurate?)  i don't want to have people reviewing changes that are actually just the entire xml file.
[16:55] <exarkun> Odd_Bloke: Yesterday you answered my question about LockDir and mkdir() over HTTP
[16:55] <exarkun> Odd_Bloke: The operation that failed was "bzr checkout".
[16:55] <luks> j1mc: I think it means that the executable bit changed
[16:56] <j1mc> luks: thanks.  i'll check that out.
[16:56] <LarstiQ> j1mc: if you do bzr diff, it should tell you what's different
[16:56] <j1mc> LarstiQ: thanks.  it looks like you're right... it is still reflecting the changes when i do bzr diff.
[16:57] <Odd_Bloke> exarkun: Right, a checkout implies that any changes you commit locally will be propagated upstream.
[16:57] <Odd_Bloke> This obviously can't happen over a dumb HTTP server, so it errors.
[16:57] <Odd_Bloke> There's a bug already open about the rubbish error reporting there.
[16:57] <LarstiQ> it could over webdav, if/when vila finishes it :)
[16:57] <Odd_Bloke> exarkun: You probably want 'branch' instead of 'checkout'. :)
[16:57] <exarkun> Odd_Bloke: To be clear, I wasn't making any changes though.
[16:58] <exarkun> Odd_Bloke: I'm not sure if you're saying it's a known bug in "bzr checkout" or if you're saying something else.
[16:59] <Odd_Bloke> exarkun: I'm saying that it's intentional that 'checkout' fails, because checking out over a read-only protocol doesn't make sense (in bzr).  I'm saying that the fact that this isn't made clear to the user until they ask in the IRC channel is a known bug. :)
[16:59] <exarkun> Aha, I understand.  Thanks.
[17:17] <j1mc> luks: you were right about the executable bit.  changing now.  thanks for your help.
[18:49] <james_w> Anyone know how to update an inventory entry?
[19:33] <speakman> luks: I'm sorry. I think I'm too new to bzr (and distributed rcs) to understand what you're telling me. :(
[19:37] <asabil> speakman: basically in DRCS, each person has a branch or a repository copy
[19:38] <asabil> actually calling DRCS DRCS, can be quite misleading
[19:38] <asabil> by DRCS are just a generalization, so basically any DRCS can also operate in a Centralized mode
[19:39] <asabil> just by having a central copy of the repository/branch
[19:39] <asabil> this is what is called the baseline (or the trunk)
[19:40] <asabil> since this is possible and very easy to have, bzr has 2 modes of operation
[19:40] <asabil> 1) normal branches (the ones you get using bzr branch)
[19:41] <asabil> 2) bound branches (aka checkouts) (the ones you get using bzr checkout)
[19:41] <asabil> if you do a bzr branch URL, you will get a disconnected (normal) branch
[19:42] <asabil> if you do a bzr checkout URL, you will get a bound branch
[19:42] <asabil> the update command is generally only meaningful in the case of bound branches
[20:15] <huslu> asabil has a good point, imo this checkout with bound branches and subtle differences like that are not very visible in user guide.
[20:16] <asabil> huslu: the best way to solve it is with a graphic
[20:16] <asabil> showing the different workflows
[20:18] <huslu> right, but at least for me still the differences weren't so clear - meaning it didn't clearly make a difference that certain things go together only with certain other things.
[20:19] <huslu> the workflows graphics does not convey that stuff is 'bound'
[20:20] <huslu> so now i am starting to get it, but it took several times reading and trying to get the point. then again i am a newcomer to version control.
[20:46] <speakman> asabil: thanks alot for youre explanation!
[20:48] <asabil> you are welcome, they are not very clear though, feel free to ask any question you might have
[20:50] <mamato> hi, i'd like to save some changes (in some separate branch?) and revert to old commit (letting those changes aside for now cause i dont like them anymore), how should i do this? commit/revert-r/more changes/commit?
[20:52] <asabil> mamato: take a look at bzr shelve
[20:53] <mamato> another question (since no one seems around ;) yet?), if i want to commit separately different parts of the changes in a file, the simplest way is to backup the file somewhere revert the second mod, commit, bring back backup, recommit?
[20:54] <asabil> :D
[20:54] <asabil> mamato: take a look at bzr-interactive
[20:55] <mamato> hmm, my bzr seems a bit out of date...
[20:55] <asabil> mamato: http://bazaar-vcs.org/BzrShelveExample
[20:55] <asabil> mamato: both are bzr plugins
[20:55] <asabil> mamato: just install bzrtools to get bzr shelve
[20:56] <asabil> concerning bzr-interactive, it is a plugin you can find in the plugins page
[20:56] <mamato> ah oki... i have 0.9...
[20:56] <asabil> that should be enough
[21:01] <mamato> actually, shelve does not look exactly like what i'm looking for... i tried switching my app to a new library, made a bunch of changes for that, realized the library doesn't do it, decided to go back to not use that new library for now (indefinitely). i just thought i'd save those changes just in case i ever want to see what i had done at that time.
[21:09] <asabil> mamato: create a new branch ?
[21:09] <mamato> maybe, i'm not sure, i haven't used branches yet... i guess
[21:10] <asabil> you started using branches from the day you created your bzr repo
[21:10] <asabil> :p
[21:10] <asabil> mamato: bzr branch -r ... branch1 branch2
[21:10] <asabil> you can branch of an old revision
[21:10] <asabil> for example
[21:11] <asabil> bzr branch -r 1234 branch.newlib branch.oldlib
[21:12] <mamato> does that create a new directory with everything duplicated?
[21:13] <asabil> yes
[21:13] <asabil> but from the revision 1234
[21:13] <asabil> 1 branch == 1 directory in bzr
[21:14] <mamato> hmm, not really necessary... especially since i haven't yet fixed the fact that way too many big objects files have been entered in the bzr db...
[21:15] <asabil> mamato: can you install bzr gtk ?
[21:15] <asabil> and then run bzr viz
[21:16] <mamato> and?
[21:17] <mamato> i already have it installed
[21:17] <asabil> it should show you the revision tree of your project
[21:17] <mamato> yep
[21:17] <asabil> just create a branch from the point where you didn't do all those changes you don't want anymore
[21:17] <asabil> isn't that what you want ?
[21:23] <mamato> looks good... thx... going back to figuring out other bzr stuff
[21:28] <mamato> how do i setup olive to work with my bzr tree? "branch/initialize"?
[21:29] <mamato> i'm looking for GUI to select multiple files and commit them together
[21:31] <mamato> hmm... nevermind... command line works great...
[21:54] <phanatic> mamato: bzr gcommit (if you have bzr-gtk installed)
[22:03] <mamato> works nice thx
[22:22] <mamato> how can i use meld to merge committed with current version?
[22:31] <mamato> whow! meld automatically works with bzr! nice!! i'm starting to quite like using bzr :)
[22:52] <asabil> mamato: bzr gconflicts
[22:53] <asabil> would allow you to run meld automatically
[22:56] <mulander> http://paste.org/index.php?id=2229 <- does bzr have a solution for such a problem?
[22:59] <luks> mulander: branches "sticking on people's hard drives" is one of the main points of bzr, but I don't think there is a CSV convertor that works in both ways
[22:59] <luks> so committing back to CVS will by probably a problem
[22:59] <mulander> luks: I am aware of DVCS main approach
[23:00] <mulander> luks: the problem is that the 'company' is using CVS, the admins have bad ideas
[23:00] <mulander> and we developers have to live with it :)
[23:00] <luks> it's weird that the admin sets the rules
[23:01] <luks> in me experience it's usually the other way around
[23:10] <asabil> mulander: cvs -> bzr should be easy
[23:10] <asabil> bzr -> cvs is technically feasible, but you will lose a lot of metadata
[23:10] <mulander> luks: this is a more compilacted thing
[23:10] <asabil> and there is no available tool for doing it
[23:10] <mulander> 1. why they do it - because we have many development teams
[23:10] <mulander> and one of them pushed their arguments before us
[23:10] <mulander> 2. the main concern are the binary files.
[23:11] <asabil> mulander: I think a DRCS is the best solution for your problem
[23:11] <asabil> and if you could s/CVS/SVN/ that would make thinks far less painful
[23:12] <mulander> asabil: the problem is that this is a large company
[23:12] <mulander> asabil: so things go slow, especialy infrastructure changes
[23:12] <luks> Tailor might be theoretically to push the changes to CVS, but I wouldn't rely on that
[23:12] <luks> er, +able
[23:13] <asabil> mulander: I managed to change this in a large company before
[23:13] <mulander> asabil: I'm trying from day 1 :)
[23:13] <mulander> bzr is one of my targets for a switch
[23:13] <mulander> the most probable one atm.
[23:13] <asabil> mulander: maybe you need to hold a presentation or a talk ?
[23:13] <mulander> asabil: had several so far
[23:14] <asabil> mulander: bzr, and mercurial are the ones I can suggest
[23:14] <mulander> asabil: bzr got better scores in the initial research.
[23:14] <asabil> :)
[23:15] <asabil> anyway, going to bed
[23:15] <asabil> gnight and good luck
[23:15] <mulander> asabil: g'night
[23:15] <mulander> asabil: thx
[23:17] <manfre> how do i remove a lock on a branch? A commit didn't process and now i can't do anything else to the branch
[23:19] <beuno> manfre, bzr break-lock
[23:19] <manfre> beuno, thanks
[23:20] <beuno> manfre, welcome'