=== Guest81090 is now known as bob2 === dereine is now known as dereine[OFF] [01:35] knielsen: thats odd, it should be streaming, which would mean you don't need remote indices cached or anything [01:35] knielsen: please file a bug! [02:40] hi, is there trac-bzr developers? === bob2 is now known as bob2_ === bob2_ is now known as bob2` === bob2` is now known as Guest6692 [05:04] mwhudson: FWIW, I've been running the Loggerhead memory stuff for nearly a day now. I haven't noticed any issues, not that I've looked. I can't say for sure, but RAM usage seems surprisingly low and stable. [05:44] Peng_: cool :) [05:44] Peng_: it will probably be a little slower, but not i'd expect you to notice === knielsen is now known as knielsen_ === knielsen_ is now known as knielsen === dereine[OFF] is now known as dereine [10:51] hm [10:51] in bzr info output. What does "submit branch:" mean. [10:52] it isn't same as push branch, nor is this branch bound. [10:54] AnMaster: I've got a feeling it might be the place you `bzr send`'d to. It's all a bit arbitrary. Bazaar's UI isn't very consistent. [10:54] submit branch is for merge and send [10:54] AfC: why is that inconsistent? [10:55] AfC, bzr send...? mhm [10:55] Mostly the fact that no one can infer what any of those things mean. If it means send destination, then perhaps call it that. [10:56] actually that branch was the old name for this one, When I changed to using a shared repo for all the branches of this project I branched the freestanding branches into the shared repo. [10:56] AnMaster: that's the alternate form of what was originally `bzr bundle`. If you like to review your patches before you send them and attach them to your emails personally, then bundle might be what you're used to. [10:56] then later deleted the freestanding ones [10:56] well, it's the operation that decides which branch to use, so it's a little trickier than that [10:56] AfC, something I never used either [10:58] AfC: I think the names for those things are pretty reasonable, but the actual rules about how they are determined are too fiddly and unpredictable. [10:58] spiv: yes, that's what I'm talking about. [10:58] "$url is the submit location? Hmm, I wonder why..." [10:59] And just wait until you try to find out what that means & how to change it in the help list. Yup. === welten is now known as welterde [12:08] hi [12:08] how do I make bzr upgrade remove an old backup.bzr dir? [12:08] it fails to upgrade because it's there [12:08] I'm hosted on launchpad [12:09] and using bzr 1.13.1 [12:12] arj_: this is a bit of a wart [12:12] arj_: you can use lftp to remove it [12:12] arj_: or i can do it for you if you want [12:15] would be nice if you could remove it: bzr+ssh://anders-gnulinux@bazaar.launchpad.net/~team-mms/mms/1.1.0/ [12:17] arj_: done [12:18] thanks! :) === dereine is now known as dereine[OFF] === dereine[OFF] is now known as dereine === dereine is now known as dereine[OFF] === dereine[OFF] is now known as dereine === dereine is now known as dereine[OFF] [16:20] hi everyone! [16:21] I'd like to make a GNU-like diff, does anyone know how to do so with bazaar? [16:27] Enisseo: is there anything wrong with bzr diff? [16:27] GNU patch has no problems understanding it [16:27] Well... I need to create a patch for a git project (I think) [16:27] is that a problem? [16:28] I tried using an external diff tool, with the --using=... option [16:28] the output if bzr diff is a standard unified diff patch [16:28] of [16:28] but the binary files are not included [16:29] (I'm on Windows XP) [16:30] I don't think there is a way to include raw binary files in the patch [16:31] I don't know of any other VCS with that ability either [16:31] so, the best way to send my "patch" may be a .tar.gz file... [16:31] is there an easy way to setup bzr so that it can use webdav or similar (commit via HTTP - preferably locked down to allow only certain accounts) [16:32] the best way to send a patch to a bzr project is to use "bzr send -o mypatch.patch" [16:32] I've read that some versions of the GNU diff manage binary files [16:32] Enisseo: yes, "diff -Naur" for example will include binary files [16:32] Enisseo: but even git will include encoded file in their internal patch implementation [16:33] luks > but this patch will not work with non-bazaar projects, right? [16:33] Enisseo: generally it will, but will not add binary files [16:35] okay, thanks, I think I will send a compressed file, it will be more convenient [16:36] I'd send the patch for text files, and separately send the binary files [16:37] that what I normally do for projects that use svn [16:37] *that's [16:37] (and this is the exact time I'd need a "bzr export -r firstRev..lastRev" feature...) [16:56] Enisseo: what would that do? [16:56] LarstiQ: export the files that have been modified or added between two revisions [16:57] Enisseo: hmja. That's not really the semantics of the export command. [16:57] * LarstiQ ponders a solution [16:58] well, not really indeed, but it's the command that matches best what I need right now ;) [16:58] Enisseo: what version would you export, all changed versions? The version of the file at the first revision, last revision? [16:59] the version of the file at the last revision [16:59] Enisseo: I'd combine bzr st -r rev1..rev2 with bzr cat -r rev2 [16:59] in order to apply a patch just by copying the exported files to the project folder [17:00] Enisseo: which will overwrite previous changes, but yeah. [17:00] yes [17:00] Enisseo: status to get the list of files changed between two revisions, and cat to get the files [17:09] I'm trying with the status command, the COPY (on windows) and a bunch of text transformations === trmanco_ is now known as trmanco [19:45] It's a bit quiet in here [19:48] Shhh. I'm hunting wabbits. === dereine[OFF] is now known as dereine === davidstrauss_ is now known as davidstrauss === dereine is now known as dereine[OFF] === Jc2k_ is now known as Jc2k === thumper_laptop is now known as thumper [23:22] hello people [23:22] I have bzr 1.15dev from the nightly ppa [23:22] and pushing a branch to LP appears to work [23:23] but I get an error when branching the branch from LP on another machine [23:23] ErrorFromSmartServer: Error received from smart server: ('NoSuchRevision',) [23:23] hi [23:23] the other machine also has 1.15dev [23:23] where you pushing a new branch? [23:24] launchpad [23:24] or does the branch already exist? [23:24] I renamed the existing one, which exhibited the same symptopms [23:24] so pushed a new stacked branch [23:24] plz excuse spelling, v.tired [23:26] please file a new bug; it sounds like you may have found a new issue [23:27] ok [23:37] lifeless: bug 367631 [23:37] Launchpad bug 367631 in bzr "Branching a stacked branch from Launchpad gives ErrorFromSmartServer: Error received from smart server: ('NoSuchRevision',)" [Undecided,New] https://launchpad.net/bugs/367631 [23:41] thumper: please include the revno of your nightly bzr package [23:41] (dpkg -l bzr) [23:41] I did [23:41] it is in the description [23:41] ok