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