[00:26] <graypoodle> hi, I am new to bzr. I have done init, add and commit. Now I am not able to push to launchpad. I am getting a whole lot of errors and finally a line asking me to mail to bazaar-ng@lists.ubuntu.com
[00:26] <graypoodle> here's the pastebin http://dpaste.com/112651/
[00:28] <Peng_> graypoodle: You're running a horribly ancient version of Bazaar. Upgrade.
[00:28] <Peng_> graypoodle: I believe that specific bug has been fixed, too.
[00:29] <Peng_> Though I doubt 0.11 is new enough to work with bzr+ssh://bazaar.launchpad.net even if it weren't for that bug.
[00:29] <graypoodle> Peng it is 0.11-1.1 on debian. Then i guess the repo is outdated.
[00:29] <Peng_> Yes, it is.
[00:29] <Peng_> It's Debian; is that surprising? :P
[00:30] <graypoodle> oh ok. i guess i will have to download the deb then.
[00:33] <graypoodle> Peng_ 1.5-1~bpo40+1  is new enough
[00:33] <graypoodle> ?
[00:33] <Peng_> Well, it's a heck of a lot new*er*, but 1.11 is the latest.
[00:33] <Peng_> I'm sure 1.5 would be fine on Launchpad, unless stacking gets involved somehow.
[00:34] <graypoodle> whats stacking, if it is not too stupid to ask.
[00:34] <Peng_> Ehh. A feature added in 1.6. :P
[00:35] <graypoodle> aah. ok. thanks a lot Peng_ i am installing the deb now.
[00:35]  * Peng_ is bad at describing things.
[00:38] <graypoodle> oh darn. just find out that python 2.5 is required but i have 2.4
[00:42] <Peng_> Bazaar supports 2.4 fine; if it requires 2.5, that's a problem with the deb.
[01:00] <graypoodle> Peng_ installer complained while it gave an error about python-celementtree not being installed. Once I installed that, bazaar installed anyway. 2.5 was just a warning i guess.
[01:00] <graypoodle> thanks a ton for the help. it works now.
[02:30] <derekS> hi guys. quick question. is there any plans for subdirectory checkout/clone (like in svn)?
[02:31] <jelmer> derekS, yes, there are plans for partial checkouts
[02:32] <derekS> jelmer: nice! do we have an eta?
[02:32] <jelmer> derekS, no idea
[02:33] <derekS> another question. if i were to modify my local branch, and then do a pull from a remote branch, what happens exactly?
[02:58] <jelmer> derekS, if you don't commit your local changes, bzr will merge in the remote changes
[02:58] <jelmer> if you do commit, you'll get a diverged branches error
[03:07] <derekS> jelmer: so it wouldn't be smart to make a cronjob to do the pull?
[03:27] <jelmer> derekS: if you're also going to be working in that working tree, probably not
[03:34] <abadger1999> I don't want to mess something up so will handle this situation:
[03:34] <abadger1999> #cherrypick a merge
[03:34] <abadger1999> cd bar
[03:34] <abadger1999> bzr merge ../foo -r81..82
[03:35] <abadger1999> do other work in both foo and bar branches.. making new commits.
[03:35] <abadger1999> then merge the rest of the changes:
[03:35] <abadger1999> cd bar; bzr merge ../foo
[03:36] <abadger1999> Will that work out? Or can the cherrypicked merge cause conflicts if the files have been edited some more?
[07:12] <graydog> i am trying to setup a script in init.d so that bzr server starts up on boot time. I know how to start the server. how do i stop it?
[07:26] <spiv> graydog: SIGTERM :)
[07:26] <graydog> spiv: hmmm. isn't there an option at the bzr server command line?
[07:27] <spiv> graydog: no, but bzr doesn't have any daemonisation builtin either
[07:27] <spiv> (although I'd like to implement that at some point)
[07:27] <graydog> spiv: aah.
[07:27] <graydog> spiv: so how is it run as  a server?
[07:27] <spiv> graydog: so what ever you use to daemonise the server process ought to provide a way to terminate the process, or at least find its pid.
[07:28] <spiv> Debian has a start-stop-daemon helper that can do that for you, IIRC.
[07:28] <graydog> spiv: well i guess pkill will do for now. or the helper.
[07:28] <graydog> thanks
[07:28] <spiv> You're welcome.
[11:16] <dereine> how can i checkout from a repo and overwrite all stuff that changed
[11:49] <spiv> dereine: pull --overwrite, perhaps
[11:49] <dereine> mh this didn't worked
[11:50] <dereine> i had to revert to a specific revision
[11:50] <dereine> i want to do the same as cvs update -C
[11:51] <LarstiQ> Do you mean, you want to become an exact mirror of the branch you're pulling from, throwing away local uncommitted changes?
[11:51] <spiv> pull needs a branch, rather than a checkout.  I'm not sure there's a way to make a checkout become a checkout of an earlier revision.
[11:51] <LarstiQ> (that would be `bzr revert`)
[11:52] <spiv> You can always use "bzr revert -r ..." to revert all or part of a working tree to a different revision, though.
[11:54] <LarstiQ> dereine: I haven't used cvs in anger for over half a decade, so I'm a bit foggy on what update -C does :)
[11:54] <dereine> spiv: thx
[11:57] <dereine> spiv: i tryed bzr revert -r ... and this came back
[11:57] <dereine> bzr: ERROR: No namespace registered for string: u'.'
[11:58] <spiv> dereine: the "..." is meant to be filled in by you :)
[11:58] <spiv> dereine: or maybe you just want plain "bzr revert"?  Either way, take a look at "bzr revert --help"
[11:59] <dereine> spiv: revert to the current revision on the remote server
[12:01] <spiv> Well, there's two different matters there, from bzr's perspective; "bzr revert" to undo any local uncommitted changes, then "bzr update" to update your checkout to be current with its master branch.
[12:01] <spiv> (Assuming you have a checkout and not a branch; if you have a branch then you'll need to pull rather than update.)
[12:05] <dereine> spiv: i have to learn allot
[12:05] <dereine> what is the difference between a checkout and a branch
[12:07] <garyvdm> A checkout does not have a copy of the repository.
[12:07] <LarstiQ> garyvdm: ehm, no
[12:07] <garyvdm> No?
[12:07] <fullermd> A checkout is just a working tree on a branch.
[12:07] <LarstiQ> garyvdm: you're thinking of a lightweight checkout
[12:07] <spiv> dereine: http://bazaar-vcs.org/Checkout and http://bazaar-vcs.org/Branch are a bit verbose but say it better than I can at this time of night :)
[12:07] <garyvdm> LarstiQ - oh
[12:07] <LarstiQ> garyvdm: or the the bzrlib concept, as fullermd seems to do.
[12:08] <LarstiQ> dereine: a checkout gives you the centralized workflow (commit goes directly to the master branch), a branch the decentralized one, where commiting and publishing a revision are decoupled.
[12:09]  * fullermd certainly doesn't think in bzrlib...
[12:09] <LarstiQ> dereine: you can convert the one into the other and vice versa.
[12:09] <LarstiQ> fullermd: I've seen you submit patches ;P
[12:09] <fullermd> Yeah, did you notice how they were rejected for knowing nothing about bzrlib?   :p
[12:10] <LarstiQ> fullermd: I chose to ignore that for the sake of this argument ;)
[12:10] <garyvdm> LarstiQ - so is you branch x y, cd y, bind x - then you have a checkout?
[12:10] <garyvdm> s/is/if
[12:10] <LarstiQ> garyvdm: yes
[12:11] <LarstiQ> garyvdm: and bzr co x y; cd y; bzr unbind; gives you a branch
[12:11]  * garyvdm has been using checkout with out even knowing....
[12:11] <LarstiQ> or well, standalone or repository branch, not a bzrlib.branch.Branch
[12:11] <spiv> dereine: the short answer is that if you used "bzr checkout" (or its alias, "bzr co"), you have a checkout, and if you used "bzr branch", you have a branch.
[12:12] <spiv> dereine: (assuming you haven't used something like "bzr reconfigure" on the checkout/branch later)
[12:12] <dereine> no sure
[12:12] <dereine> i want to revert stuff i have done
[12:12] <dereine> but revert to the state on a server
[12:14] <spiv> Btw, "bzr info" can tell you what kind of thing you have (e.g. a "standalone branch")
[12:15] <LarstiQ> dereine: does 'stuff i have done' include commits, or only uncommitted changes?
[12:16] <dereine> both
[12:30] <spiv> Uncommitted changes are easy; bzr revert.  If you have commits then I guess you have a branch, so you'll also need to do a "bzr pull --overwrite"
[13:41] <aldolat> hi! I have a bzr lock on launchpad and I am unable to break it. can you help me?
[13:44] <garyvdm> aldolat: Was the lock created by you are someone else?
[13:44] <aldolat> by me
[13:44] <garyvdm> What is the branch?
[13:44] <aldolat> wait...
[13:45] <aldolat> ~ubuntu-it-magazine/fcm-it/edizione-fcm-it/.bzr/branch/lock
[13:45] <aldolat> https://code.launchpad.net/~ubuntu-it-magazine/fcm-it/edizione-fcm-it
[13:46] <garyvdm> I think there is a bug with breaklock/lp when you specify a lock with breaklock
[13:46] <garyvdm> Try breaklock branch
[13:46] <aldolat> bzr breaklock branch ?
[13:46] <garyvdm> yes
[13:47] <aldolat> tried... nothing happened
[13:47] <aldolat> try now to push
[13:48] <LarstiQ> aldolat: what url do you give to break-lcok?
[13:48] <aldolat> i tried the url bzr gave me...
[13:48] <aldolat> but does not recognize it
[13:48] <aldolat> wait a moment
[13:49] <aldolat> it says
[13:49] <aldolat> bzr: ERROR: Unsupported protocol for url "lp-46726096:///~ubuntu-it-magazine/fcm-it/edizione-fcm-it/.bzr/branch/lock"
[13:49] <aldolat> bzr gives me that url but it does not recognize it
[13:49] <aldolat> o_O
[13:49] <garyvdm> What I was trying to say - is that you need to just specify the name of the branch - not the name of the lock that bzr reports
[13:50] <garyvdm> e.g bzr breaklock lp:~ubuntu-it-magazine/fcm-it/edizione-fcm-it/
[13:50] <LarstiQ> aldolat: remove the -42..
[13:50] <LarstiQ> what garyvdm says
[13:50] <aldolat> trying...
[13:51] <aldolat> well, it's going :D
[13:51] <aldolat> thank you, masters!
[13:53] <garyvdm> bzrtool 1.11 still not in the ppa :-(
[13:54] <garyvdm> *bzrtools
[14:02] <aldolat> "Pushed up to revision 287."... thanks garyvdm and LarstiQ :D
[14:03] <aldolat> going out...
[14:04] <Peng_> Was that URL bug fixed?
[14:12] <duckx> hy
[14:13] <duckx> I was wondering was the current state of Foreign Branches ...
[14:13] <duckx> I tried to checkout an SVN tree with bzr ... and well it misses the external references ...
[14:14] <LarstiQ> that's more to do with lacking nested trees support in bzr than with bzr-svn
[14:14] <LarstiQ> duckx: as a workaround you could use scmproj or config-manager
[14:15] <duckx> Thx LarstiQ , I will have a look to config-manager ... but anyhow, it is a bit anoying to have to setup an extra thing to checkout a project ;)
[14:16] <duckx> LarstiQ: is it an short time / long time goal to have it supported natively ?
[14:16] <LarstiQ> duckx: loooong term
[14:17] <duckx> -> it is a feature I want/like to have for a long time .. ;)
[14:17] <LarstiQ> duckx: exactly
[14:17] <LarstiQ> duckx: lp:~larstiq/bzr/nested-trees has not been progressing for a long term
[14:17] <duckx> LarstiQ: it really blocking for big projects that deals with a lot of libraries
[14:17] <LarstiQ> duckx: it would be very nice to have
[14:17] <LarstiQ> s/term/time/
[14:17] <garyvdm> Peng_: I'm not sure if it is logged as a bug? There is a question: https://answers.launchpad.net/launchpad/+question/35522
[14:18] <duckx> LarstiQ: too bad ...
[14:19] <duckx> I tried to manage an horde framework with bzr, and currently it can't be managed natively with bzr .... well the way I would like it to be managed ;)
[14:19] <LarstiQ> duckx: now, if you're willing to help, I'd welcome that :)
[14:20] <duckx> LarstiQ: I feel not good enough, to go deep in the bzr thing ... ;(
[14:20] <duckx> I am an happy end user thought ...
[14:20] <duckx> LarstiQ: ... but it is really blocker in on workflow ...
[14:21] <duckx> Decentralizaition of svn trees ...
[14:21] <duckx> Well, in a way I would like to just co an svn tree, do a few hacks, and submit them to the relevant project
[14:22] <duckx> Only works half of the time currently due to the lack of external referencies support ;(
[14:23] <duckx> I will probably make a post about it on the mailing list ...
[14:23] <duckx> As I think it is blocker for many projects to migrate from an SVN tree to bzr ...
[14:24] <LarstiQ> duckx: you can help in different ways, don't have to do the actual coding
[14:24] <duckx> Is there a todo list around ?
[14:25] <duckx> I feel like a happy hacker sometime, even thought the responsiveness of open source project is sometime really slow ;)
[14:25] <LarstiQ> duckx: what is there is outdated I'm afraid.
[14:26] <duckx> Ok, well, I will continue to read the mailing list ... May be something will inspire me one day ;)
[14:26] <duckx> But currently i am on a few things ...
[14:26]  * LarstiQ nods
[14:26] <duckx> Getting synchronisation working with libsyncml on my samsung phone
[14:27] <duckx> Getting UPNP working in pidgin ... well it currently sucks as hell ;)
[14:27] <duckx> And for this I need a good VCS ;) i still think bzr is the one ..
[14:28] <duckx> Well lets have a look @ config-manager ...
[14:28] <LarstiQ> duckx: scmproj is more recent
[14:29]  * duckx on co scmproj
[14:29] <duckx> Any debian package around ?
[14:31] <duckx> Thx for your help LarstiQ
[14:32] <LarstiQ> duckx: hmm, don't think so
[14:32] <duckx> ;)
[14:37] <LarstiQ> (about scmproj debian packages)
[16:26] <graydog> hi, i started bzr serevr with write acess and am pushing about 1 gb of files to it from a client. The server bzr process is running with 99.9% cpu load and the client gets stuck. ^c gives the output Cbzr: A nested progress bar was not 'finished' correctly. The files still seem to be uploading as df -h on the server shows the size increasing slowly.
[16:26] <graydog> I am using bazaar v1.5 on the server. could that be the problem?
[16:42] <jelmer> graydog, Yeah, I would suspect that to be fixed in newer versions
[16:42] <graydog> jelmer: thanks
[17:56] <Lo-lan-do> Is there a way to replicate a repository (or a set of branches) in one bzr command?
[18:22] <MattCampbell> The bzr PPA for intrepid seems broken; it includes bzrtools 1.10 (which depends on bzr < 1.11) but also bzr 1.11.
[18:27] <jelmer> Lo-lan-do, I think several people have tried to create plugins for that
[18:27] <MattCampbell> So for now I'm installing bzr without bzrtools though aptitude gave this solution a negative score.
[18:28] <Lo-lan-do> jelmer: I'll take that as a "no" then :-)
[19:07] <thumper> Lo-lan-do: bzr init-repo creates a repository
[19:07] <thumper> Lo-lan-do: not sure if that is what you are asking for
[19:07] <thumper> Lo-lan-do: what type of set of branches are you wanting to create?
[19:12] <Lo-lan-do> thumper: The question is how to fetch several (or all) branches from a remote repo into mine, in one command if possible.
[19:13] <Lo-lan-do> I could of course loop over $(bzr branches), but I find it lacks elegance.
[19:14] <Jc2k> Lo-lan-do: i wonder how hard it would be to adapt multi-pull...
[19:16] <LarstiQ> Lo-lan-do: or scmproj maybe?
[19:16]  * LarstiQ confesses he hasn't looked closely at scmproj yet
[21:50] <gioele> what is the bzr repo for the 1.11 branch of bzrtools? shoud I use lp:bzrtools?
[21:51] <thumper> gioele: it appears that the 1.11 branch of bzrtools isn't available
[21:51]  * thumper pokes statik
[21:51] <gioele> thumper: but it has been released as tar.gz http://launchpad.net/bzrtools/stable/1.11.0/+download/bzrtools-1.11.0.tar.gz
[21:52] <thumper> gioele: yeah, but the packaging is dones by someone else
[21:52] <gioele> I see
[21:53] <gioele> it is a bit strange that bzrtools makes such a "messy" use of bzr and launchpad 8)
[22:05] <fullermd> bzrtools isn't branched AFAIK...
[22:35] <thumper> are there some docs somewhere that talk about bzr's use of http proxies?
[22:40] <spiv> thumper: there's some mention in http://doc.bazaar-vcs.org/latest/en/user-reference/bzr_man.html#authentication-settings relating to authentication bits.
[22:41] <thumper> spiv: ta
[22:41] <thumper> spiv: you back at work now?
[22:41] <spiv> thumper: there probably should be more...
[22:41] <spiv> Yep.
[22:44] <thumper> spiv: how does bzr know to use the [proxy] section?
[22:44] <spiv> I have no idea, unfortunately.
[22:45] <spiv> Hmm, the top of the Authenication Settings explains, I think.
[22:46] <spiv> It matches on whatever bits of the URL you specify, e.g. host, port.
[22:46] <spiv> If you don't need auth, then I assume just setting $http_proxy in your environment would work too.
[23:27] <spiv> Hmm, my laptop has started to lock up for no reason.
[23:42] <spiv> I guess my laptop would rather still be in Hobart...