[08:40] trying to setup a lp project for the first time and getting an error trying to checkout [08:40] $ bzr checkout lp:umonya-website trunk [08:40] bzr: ERROR: Not a branch: "bzr+ssh://bazaar.launchpad.net/%2Bbranch/umonya-website/". [08:40] project is https://launchpad.net/umonya-website/trunk [08:41] any ideas? [14:52] hi. [14:52] I am getting the error [14:52] bzr: ERROR: No WorkingTree exists for "file:///D:/foo/.bzr/checkout/". [14:53] even though I have .bzr folder in the dir. [14:54] It seems something messed up the folder. [14:54] is there a way to fix ? [14:54] (except a full checkout) [14:57] and if I am running status command that folder: http://pastie.org/1559377 [14:57] very strange. [15:00] sobersabre: there is a branch present but no working tree [15:00] sobersabre: try running 'bzr co' in that location [15:08] jelmer: I think the problem is the p4 messup. [15:08] I am not sure which exactly. [16:51] hello all. I want to apply a patch to a project using bzr. Someone provided a diff output using git: [16:51] http://launchpadlibrarian.net/63734242/fix-gcc-4.6-build.patch [16:52] when I do "bzr patch foo.patch" then I get only error messages like [16:52] 1 out of 1 hunk FAILED -- saving rejects to file b/src/xml/helper-observer.h.rej [16:52] what can I do? [16:55] theAdib: Based on that error message, I am guessing you need to use the "-p 1" option to patch [16:59] hm, less errrors there. But still: [16:59] adib@vega:~/Projekte/Inkscape/inkscape/myproject-707205$ bzr patch -p 1 fix-gcc-4.6-build.patch [16:59] 1 out of 1 hunk FAILED -- saving rejects to file src/2geom/utils.h.rej [16:59] 1 out of 1 hunk FAILED -- saving rejects to file src/application/editor.h.rej [16:59] bzr: ERROR: Patch application failed [16:59] adib@vega:~/Projekte/Inkscape/inkscape/myproject-707205$ [17:02] ah, ok I see. The target file has been change since and now I have to apply the patch manually. Thx, my bad. [17:02] If it's only 2 files out of 78 with errors, it suggests that those are valid conflicts caused by changes upstream [17:02] right === Leonidas_ is now known as Leonidas [19:07] I've been using bzr for 3 or 4 years now, without problems, until recently I encountered this error: bzr: ERROR: No WorkingTree exists for "file:///home/damon/digitalPhotos/rapid/.bzr/checkout/". [19:07] I don't know what caused it, or how to fix it [19:10] dlynch: is that on your server perhaps? [19:10] lifeless, no... it's on my laptop [19:11] so what it means is that you don't have a working tree, and you're running a command that needs one [19:11] the machine I do all my development on [19:11] we don't create working machines when you push over the network [19:11] I always had a working tree before [19:11] (otherwise we'd be pushing twice as much) [19:11] its a bit of a mystery why you don't have one [19:11] yes indeed [19:11] did you change your toolchain recently? [19:11] (e.g. start using bzr-explorer or something) [19:12] I've been using bzr-explorer for a while [19:12] anyhow [19:12] to make a working tree [19:12] cd to rapid [19:12] and do [19:12] 'bzr checkout .' [19:12] what will happen to all the changes I've made in the code? [19:12] uhm [19:13] can you do 'ls -al /home/damon/digitalPhotos/rapid/' [19:13] and [19:13] ls -al /home/damon/digitalPhotos/rapid/.bzr/ [19:13] I can always overwrite them from backup, so I guess it's not a big deal [19:15] I guess there are two ways to handle this: 1) do the checkout, potentially overwrite all my changes, and then restore those changes from local backup, or 2) take your time and mine do try to get to the bottom of it. Does option 1) sound better? :) [19:15] I'm easy [19:16] I'll be surprised - and it will indicate a pretty severe bug - if you have working files in /home/damon/digitalPhotos/rapid/ already. [19:17] http://pastebin.com/T8TRmMt5 [19:17] http://pastebin.com/1Fj2WPrQ [19:18] interesting [19:18] can you look in backup.bzr [19:19] dlynch: is rapid itself meant to be a project, or is it a collection of projects? [19:19] ok.... I just thought of something..... recently I moved my home partition, restoring from backup using rsync.... with an exclude rule for checkout/ [19:19] I had that rule because I was experimenting with gnome 3 code [19:20] I guess when I did the restore, a bzr dir was excluded! [19:20] a [19:20] yes, that would do it [19:20] ok sorry about that [19:20] rsync filters are regexes [19:20] yes [19:21] or something like them [19:21] I should have used a full dir path [19:21] they need to be rooted or they match every dir [19:21] mystery solved [19:21] ok [19:21] so to fix this problem, I do a checkout, overwrite whatever gets overwritten, and then restore from local backup [19:23] lifeless, thank you very much :) [19:24] or just copy that checkout from the backup [19:24] (the .bzr/checkout) [19:24] /all/ your bzr working areas are going to have this issue [19:24] If I was you I'd figure out how to get rsync to copy all the bits you missed [19:24] be faster over all [19:26] lifeless, the problem is they were not backed up to begin with, because I use the exclude rule in the actual rsync command to backup [19:26] ah [19:26] so [19:26] there is another thing you can do [19:26] will avoid the need to restore [19:26] cd /tmp [19:27] bzr checkout --lightweight /home/damon/digitalPhotos/rapid/ foo [19:27] cp -a foo/.bzr/checkout /home/damon/digitalPhotos/rapid/.bzr/checkout [19:27] wow bzr status now works [19:29] find /home -name 'branch' -type d [19:29] should find all the places you need to do that [19:33] thanks very much lifeless.... I really appreciate it! [19:33] no worries [21:30] hm [21:30] http://bazaar.launchpad.net/~launchpad-pqm/launchpad/devel/files [21:30] no [21:31] $ bzr get lp:~linaro-infrastructure/launchpad-work-items-tracker/linaro [21:31] bzr: ERROR: Invalid http response for https://xmlrpc.launchpad.net/bazaar/: Unable to handle http code 400: Bad Request [21:31] not seen that before [21:32] meep ? [21:33] huh, worked the second time [21:34] nothing much in .bzr.log either