yacoob*tap*tap* is this thing on? :)00:00
* fullermd notes that in his years of running theatre tech, there was a standing order that tapping microphones was cause for finger-breaking...00:03
yacoobluckily this doesn't work yet over tcp/ip 8)00:04
fullermdI know.  Insufficient future-proofing   :(00:05
maxbI've never had cause to use bzr over smb, but that error does sound like that might be the problem.00:05
yacoobthere's bug 31006, but *somehow* it was working for me before (with bzr 1.6 or so)00:06
ubottuLaunchpad bug 31006 in bzr "dirstate file locking doesn't work on smb mount on osx - bzr add, bzr status, and bzr commit fail over a SMB share (dup-of: 98836)" [High,Confirmed] https://launchpad.net/bugs/3100600:06
ubottuLaunchpad bug 98836 in bzr "[MASTER] "OS locks must die" - dirstate file write locks exclude readers and limit portability" [High,In progress] https://launchpad.net/bugs/9883600:06
yacoobmy repo was pack-0.9200:07
yacoobit works with that format00:08
yacoobit very much doesn't with 2a00:08
maxbIt's breaking in even more esoteric ways for me00:08
yacooble sigh.00:09
yacoobno love for this bug since 2009/09/2900:09
yacooband I've foolishly said 'bzr upgrade' on my shared repo. Yay.00:11
yacoobno way to downgrade, right?00:11
yacoobok, 'bzr upgrade' performed on a shared repo did... weird things. Topmost .bzr is no longer there, and I can't run 'bzr info' in that directory anymore00:17
yacoobexactly *one* of the repos below got converted from pack-0.92 to 2a00:17
yacooband that directory got 'backup.bzr' directory00:18
=== timClicks is now known as timClicks_away
lifelessyacoob: the dirstate code doesn't change from pack-0.92 to 2a01:05
lifelessyacoob: something else has altered01:06
lifelessyacoob: it also doesn't impact repositories at all, only working trees01:06
yacooblifeless, interesting. But I've just verified that 'bzr push' from my local machine to a directory mounted via smbfs will work when format is pack-0.92, and fail with 2a01:07
yacoobboth locks and oplocks seem to be there01:08
lifelessfile a bug then01:08
yacoobI'll do that tomorrow I think. Kind of sleepy now :)01:09
fossroxhi guys!01:31
fossroxI've noticed a problem in documentation: http://doc.bazaar.canonical.com/bzr.dev/en/user-guide/introducing_bazaar.html01:31
fossroxlink: Bazaar Quick Start Card - a one page summary of commonly used commands.01:32
fossroxNot found: http://doc.bazaar.canonical.com/bzr.dev/en/quick-reference/quick-start-summary.svg01:32
fossroxthanks in advance guys!01:32
dOxxxgood evening02:20
dOxxxany mac users around that would be willing to try installing the bzr 2.0.4 package I just built?02:21
dOxxxI'd like to have some verification other than my machine before I upload it to the bzr release page02:21
dOxxxAnyway, if there is anybody here that's willing, try it here: http://launchpad.net/bzr-mac-installers/2.0/2.0.4/+download/Bazaar-2.0.4-1-desktop.pkg02:28
dOxxxI'll be doing the same for the 2.1.0rc1 installer02:28
dOxxxa clean build of the mac installer takes like 25 minutes :(02:33
dOxxx90% of it is pyqt I'm sure02:34
MTecknologyAny ideas what causes this to happen? No handlers could be found for logger "bzr"02:59
dOxxxMTecknology: context?02:59
MTecknologyIt's only happening when I try to do bzr pull from www-data user02:59
MTecknologydOxxx: I found out what'03:00
MTecknologys wrong... typo03:01
MTecknologymaybe not...03:02
MTecknologyCould be an environment thing :S03:02
dOxxxlooks like it might be bug 50388603:04
ubottuLaunchpad bug 503886 in bzr/2.0 "Server logging errors are hard to debug" [Medium,Fix released] https://launchpad.net/bugs/50388603:04
dOxxxyou may want to try the newly released bzr 2.1.0rc1 or 2.0.4 which have a fix for making it easier to see what the error on the server is03:05
dOxxxbut I would hazard a guess that your ~/.bzr.log cannot be accessed as the www-data user03:05
dOxxxon the server03:06
MTecknologydOxxx: looks like that user can access that fiel03:19
MTecknologydOxxx: but deleting it removed the error - thanks03:19
lifelessoh hai, it is the internets04:03
fullermdI made you an internets, but I eatered it.04:03
lifelessI'm in your router eating your packetz?04:04
dOxxxgood night all05:10
micahghi, how do I merge in a branch with no common ancestor?06:14
PengUm, IIRC "bzr merge -r 0..-1 /path/to/branch".06:17
PengI don't remember if there are any caveats.06:17
PengThat may do a cherrypick and drop the actual revision information...06:17
PengI know what you want is _possible_, I just don't remember exactly how. :P06:17
micahgPeng: worked, thanks06:17
micahgor maybe not...06:18
micahgit moved the directory :(06:18
micahgnow I have debian and debian.moved06:18
micahgpeng: ^^06:22
Pengmicahg: Uh-huh. If both branches have directories named "debian", it's a conflict/.06:39
micahgPeng: what do I do?06:41
RAOFResolve the conflicts?  IE: work out what's different in debian & debian.moved, work out what you want in debian/, and then delete debian.moved.06:42
RAOFmeld is a good tool for the task of producing the debian/ you want from debian & debian.moved06:42
micahgk, so it'll still have the history from the new branch if I do that?06:43
* micahg wishes winmerge was ported to linux06:43
RAOFIt's called *meld* :)06:44
micahgRAOF: I've tried meld in the past unless 1.3 is a new version06:44
* micahg will try it now06:44
micahgthey seem to have made some improvements :)06:45
RAOFLooking at the screenshots I can find for winmerge, it looks almost exactly like the meld I know & love.06:45
micahgRAOF: so, I moved what I want into the debian dir, but the diff seems to show that everything's changed?07:15
micahgdid I want to go the other way?07:15
RAOFmicahg: I'm not 100% sure what you've done, so I'm not sure.07:30
micahgI added the files from debian.moved that I wanted to debian07:30
micahgbut now bzr diff shows evrything different07:30
micahgwas I supposed to merge into debian.moved instead>07:30
RAOFdebian.moved will be the debian directory of the branch you tried to merge *into* the current branch (ie: if you ran bzr merge $TARGET then debian.moved will be the debian dir from $TARGET).07:32
RAOFYou should end up with just a single debian directory by merging the changes you want from debian.moved into the files in debian.07:32
micahgdebian.moved was the original dir07:32
RAOFI might have it the wrong way around, then.  From memory, it's the directory from the thing that you're trying to merge from that gets renamed in a conflict.07:34
micahgRAOF: bottom line though is I want to move the new stuff into the old dir?07:34
RAOFYeah.  At the end, you want the debian/ directory to contain the stuff that you want.07:35
micahgRAOF: did that, but I still have issues07:35
micahgso I need to move the stuff from debian to debian.moved and then delete debian and rename debian.moved?07:35
* micahg fires up meld again trying to get this right07:36
RAOFI'm not totally sure what your issues are.07:37
RAOFI'm pretty sure that it doesn't really matter how you end up with the debian/ directory, though.  Moving stuff from debian.moved => debian, or moving from debian=>debian.moved & then renaming debian should be equivalent.07:38
* micahg is very lost07:41
RAOFLet's try and help me work out precisely what's happening :)07:41
micahgI'm running bzr merge -r 0..-1 TB3 into TB207:42
RAOFIn your current tree, you've got debian and debian.moved.  You've taken all the changes from debian.moved that you wanted & applied them to debian, so debian/ is now what you'd like in your final tree.07:42
micahgthis creates a debian dir of tb3 contents and debian.moved of tb2 contents07:42
micahgI moved what I wanted into debian07:42
micahgbzr diff shows everything is diffferent07:43
RAOFBy “everything”, what do you mean?  Can you pastebin the output of bzr diff?07:43
micahgit removes and adds the files07:44
micahgI can;t even do bzr diff on one file07:46
RAOFCan you pastebin the full diff?  I'm having difficulty visualising what's happening07:54
micahgno, it's 24k lines07:56
micahgRAOF: ^^07:57
RAOFI'm not really sure what's happening, sorry.08:03
RAOFI'll try to make a simple analogue of what you're doing locally; see if I can wangle it.08:05
micahgRAOF: you can reproduce, branch thunderbird-3.0.head and thunderbird.head from code.lp/thunderbird08:07
abliHi! How can I 'join' different projects? I.e. merge all versions from one into the other, if they don't have a common ancestor? 'bzr merge' works only if there is a common ancestor, merge-into plugin ditto; fastimport plugin apparently wants to replace the full version history instead of tacking it at the end.12:15
Pengabli: "bzr merge -r 0..-1 foo" should work.12:22
abliOk, I'll try that.12:24
PengPossible side effects include unhappiness, maiming, and death. or not.12:25
abliIt appears thats what I was looking for. Thanks!12:33
goneriHi, I did a svn→bzr transition and now I've a broken branch that don't share revision with trunk. This branch starts when the svn branch had been created. So now Bzr can't merge this branch in trunk since there is no shared references. Is there a way to edit the initial revision of my branch?14:22
=== khmarbaise_ is now known as khmarbaise
=== Adys_ is now known as Adys
mobodowhen I do 'bzr export --format="zip" - myDirectory', I got nothing, but if I do 'bzr export --format="tgz" - mDirectory', it works16:15
mobodoalso, zip to a file instead of stdout works16:16
Colonel-Rosamorning, does anyone know of a bzr netbeans plugin?16:37
Colonel-RosaIf not, I'll head the advice found on the wiki and clone the hg plugin and see what I can do16:37
=== fossrox_ is now known as fossrox
keithy_hi whats the statuse on nested tree support?18:19
The_UserHi! Is there anything like "svn (up|co) -N" in bazaar?18:28
The_UserIn svn you can do a checkout this way without downloading all the contained files and subdirectories, you use "svn up" without "-N" to download them completely.18:34
jpdsThe_User: bzr update|checkout ?18:41
The_Userjpds: yes, but without downloading all sub directories18:42
mobodocould somebody confirm something for me? I think "bzr export --format=zip - " is broken20:04
mobodowith tar/tgz/tbz2 it works fine (export to stdout), but not with zip20:05
mobodojust want to check if it's my installation that's broken or bzr20:05
mobodo(export to a file works, it's just to stdout that's broken)20:05
fullermdThe_User: (hours later) No, the working tree (or revisions thereof) is always entire.23:03
The_Userfullermd: okay :23:03
fullermdNow, that's no theoretical boundary to only _checking out_ parts of it.23:04
fullermdBut certainly anything dealing with history has a revision's full tree as its smallest component.23:04
fullermdAnd there's no implementation of checking out part of a tree.  The 'view' support can sorta let you post-facto treat a full checkout as if it were partial, but that doesn't help you   :)23:05

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!