/srv/irclogs.ubuntu.com/2011/02/01/#bzr.txt

maxbRonnie: I've pushed the result of those three merges to lp:~maxb/loco-directory/710969-example in case an example is helpful00:01
Ronnieyes, an example could be very usefull00:02
Ronnieill have a look00:02
maxbWhen I said:00:05
maxb< maxb> So, at some point in the past, you merged your 570613 branch into your 611304 branch. Then, on your 570613 branch, you reverted most of the changes. Later, the 570613 branch got merged into the upstream branch00:05
maxbI got some of the numbers wrong00:05
maxbI should have said:00:05
maxbSo, at some point in the past, you merged your 570613 branch into your 611304 branch. Then, on your 611304 branch, you reverted most of the changes. Later, the 611304 branch got merged into the upstream branch00:05
spivvila: I didn't know that, thanks for mentioning it.  I don't *think* there's any obviously relevant bug fixes since then, but it's possible...00:11
Ronniemaxb: i had difficulties to read the log (history viewer from a nautilus plugin) but i think i get it. but i dont know what commands to use te revert it00:20
Ronniei normally only work with the branch, merge, status commands, and sometimes the resolve00:21
maxbRonnie: I would very much recommend installing bzr qlog00:21
Ronniemaxb: do you have a link, branch for that?00:22
maxbRonnie: ubuntu?00:22
Ronnieyep00:22
maxb'apt-get install qbzr'00:22
maxbAnd yes, it will probably want to install megabytes of libqt*, but I find it to be worth it, for the ease with which it lets you understand complex merging00:23
Ronnienah, i had already the qt libs00:23
maxbRonnie: I've appended the commands I used to bug 71096900:26
ubot5Launchpad bug 710969 in Bazaar "Merge did not work as expected" [Undecided,Invalid] https://launchpad.net/bugs/71096900:26
Ronniemaxb: is ci a shortcut for commit00:28
maxbyes00:28
Ronnieah, thx00:28
Ronniehmm, i did not find qlog more informative than bzr-gtk history viewer (did you ever try that one?)00:29
maxbIt's an abbreviation for "Check In" - which is actually quite silly, as it's a hold-over from the dark ages of locking VCS, but people still use it because it's short :-)00:30
maxbI have used bzr viz. I found bzr qlog quite superior, due to its flexible expanding and contracting of branches00:30
Ronniemaxb: at the command:  "bzr merge -r revid:peter.puk@gmail.com-20101219212501-141eds74nzwexdlt ../0.2/"  it shows some errors. should i resolve these now, or do all the other commands first?00:33
maxbhmm. It did not show errors for me00:35
* maxb rechecks00:35
maxboh, conflicts, not errors00:37
maxbThe next command "bzr revert ." will get rid of them00:37
Ronniemaxb: yea, conflicts00:37
Ronniehttp://paste.ubuntu.com/560793/00:37
Ronnieoh, ok00:37
Ronniemaxb: thx it works like expected00:42
maxbnp00:53
poolielifeless, did you already reset loggerhead trunk to 1.18?05:31
lifelessno05:31
lifelesswas waiting on the 2a update to pthe pqm branch05:31
lifelesswhich happened just recently05:32
lifelessi couldn't sensibly push/compare etc before then05:32
vilahi all !07:41
* fullermd flops at vila.07:45
vila;)07:46
pooliehi there vila, fullermd07:51
vilahey poolie !07:51
poolievila, i should stop for the day i guess08:03
pooliehow are things with you?08:03
vilapoolie: fine, setting up a local package importer, going through the hidden dependencies, should be usable today (with its associated ppa)08:04
poolieah, good08:04
poolieit's already in a ppa, or you're going to make one?08:04
pooliei looked a bit at https://bugs.launchpad.net/loggerhead/+bug/70132908:04
poolieand we learned a bit, though not yet what the final answer is08:05
vilaI just created a new one to stop misusing my own (still private to me so far but allowing to track the precise versions)08:05
poolievila, actually can you give me a quick call at home?08:06
vilasure08:06
vilagha, phone battery empty, just a sec08:07
fullermdBattery?  But, phones get all their power from the 4 little copper wires going into them...08:08
vilafullermd: 4 ? We do fine with 2 around here... :D08:35
viladamn, totally missed this one, 2 for power and 2 for line which is why it failed >-)08:35
fullermdWell, OK, only 2 technically needed for single-line basic working.  But I don't remember the last time I saw a 2-conductor cable going into 6P2C connectors, so...08:40
vilaconnectors... we still have old phone plugs with 8 wires here (but rj11 is 6 right ?)08:46
fullermd6P4C as a rule.08:48
fullermdThough now that I double check, my desk phone actually has an integral cable that's 6P2C.  Cheap bastiches.08:49
vilacan't you just settle on international standards for once... :-P08:52
fullermdHey, we adopted International Morse over American.  What more do you want?   :p08:53
vilametric system ?08:53
fullermdI tried drinking 473 cc's of beer once.  Didn't taste near as good as a pint.08:54
vilaOh I don't mind pints, but mphs are a booby-trap, I keep trying to jump out of cabs at 30...08:56
fullermdYou just gotta roll.08:58
sobersabrehi, I am confused a bit.09:25
sobersabreI have a bzr tree, let's call it /tree109:25
sobersabreI also have another tree /somewhere/tree209:25
sobersabreI want to reach /somewhere/tree2/tree109:26
sobersabrewhen all history from tree2 and tree2 are preserved.09:26
sobersabrehow do I translate this into bzr operations ?09:26
sobersabreis it possible ? what possible problems may occur ?09:26
fullermdcd /somewhere/tree1 ; bzr branch /tree1 ; bzr join tree1 ; bzr commit09:27
fullermdThat's basically equivalent to cd /somewhere/tree2 ; bzr merge -r0..-1 /tree1 ; [move all files into tree1/ subdir] ; bzr ci09:27
sobersabrefullermd: you've confused tree1 and tree2.09:28
fullermd(not exactly, but conceptually it gets you in the right territory)09:28
sobersabrefullermd: I understood yer 1st remark.09:28
sobersabreI got lost on the 2nd.09:29
sobersabreif I am merging tree2 into an empty tree1 ... what am I achieving ?09:29
sobersabreI mean you suggest to create a copy of the tree /somewhere/tree2, in /somewhere/tree2/tree1 ?09:30
fullermdMmm.  If I'm backward on tree1 and tree2, I don't understand what you're saying...  it certainly sounds like you're wanting to put tree1 (and all its history) in a subdir of tree2.09:30
sobersabretrue.09:30
fullermdThen...   oh, I typo'd "/somewhere/tree1" for tree2 right at the start there.09:31
* fullermd blames vila.09:31
sobersabrelet's make is easier in naming: /1 is a tree. /d/2 is a tree. I want to have: /d/2/1/09:31
sobersabrefullermd: what is vila.09:31
fullermdAn evil spirit that inhabits #bzr and screws with my typing.09:32
vilawell, for my defense, I'd point out that sobersabre also confused 1 and 2 in: " when all history from tree2 and tree2 are preserved." :-D09:32
sobersabrevila: true :)09:32
sobersabreso, if I translate it:09:32
fullermdIt's in your defense that you're screwing with HIS typing as well as mine?   :p09:32
vilawell, let say I'm quite generous and love to share my tyops09:33
sobersabrecd /somewhere/tree2 ; bzr branch /tree1; bzr join tree1; bzr ci -m "join-a-tree"09:33
sobersabrevila: I've never seen your tyop. can you share ?09:34
fullermdYes.  'join' is roughly equivalent to 'merge' into a subdir.09:34
vilasobersabre: you're new here right ? Just you wait and you'll see my tyops soon enough ;)09:36
fullermdSo you wind up with a merge commit, with the whole history of tree1 off on the RHS.  Except that from tree2's perspective, it all happens inside '$ROOT/tree1' instead of '$ROOT'09:36
sobersabrehm.09:37
sobersabreI did an experiment.09:37
sobersabreI WANT the history of tree109:37
sobersabreso I rephrase: I have /path/tree1, /path/tree2. I want to have /path/tree2/tree1  so that now have both files from /path/tree1 in /path/tree2/tree1, AND the history of /path/tree1 is inside the history of /path/tree2 (if I run bzr log)09:39
fullermdYes, that's why you're join'ing.09:39
sobersabreoh, I see.09:40
sobersabreIf I run bzr log -n0, THEN I see merged stuff.09:40
sobersabrecool09:40
sobersabrevery nice.09:40
vilasobersabre: give a try to 'bzr qlog' from the qbzr plugin too09:41
* fullermd always wonders if he should pronounce that "cube-zor"...09:42
sobersabrefullermd: call it 'cuby'09:46
sobersabreq b09:47
vilacude-zor sounds right, but then, I'm not a native speaker so me and accents...09:47
fullermdIt brings to mind many long hours wasted playing Q*bert.09:48
jelmermaxb: hi10:00
jelmermaxb: what does that recent MP change exactly?10:00
maxbjelmer: You asked for some added docstrings10:05
maxbOh, wait. bzr MP or bzr-svn MP ?10:06
jelmermaxb: bzr-svn mp10:09
jelmermaxb: I don't see any new docstrings in the MP email10:09
maxbhmm. I pushed... I thought. Let me check10:10
maxbThey're on LP10:11
maxbbut for some reason it's not representing my additional pushed revision in-line in the comment flow of the MP10:12
vilamaxb: there is probably a bug around that, I notice it randomly10:14
jelmermaxb: got it now, thanks10:27
jelmervila: There have been some bugs related to file id rewriting in working trees after dpush recently10:27
jelmervila: it uses tree transform, which is still a bit obscure to me. I was wondering if you could have a look to double-check I'm using the API correctly?10:28
vilajelmer: urgh, yeah, I can try, but I've been notoriously bad at that myself (though I learned a few tricks in the process)10:29
vilajelmer: where should I look ?10:29
jelmervila: bzrlib/foreign.py, function update_workingtree_fileids()10:30
vilain trunk ?10:30
jelmeryep10:30
jelmerthough it hasn't changed since 2.1 I believe10:30
maxbjelmer: Oh, btw, i have an Approved dulwich MP, is that just wsiting for next time you do work on dulwich, or do you need amything more from me there?10:32
jelmermaxb: I'll have a look10:34
* jelmer wished there was a good way to see all the MPs he was involved with10:34
jelmermaxb: that's already been merged10:34
maxbhuh10:35
maxbsilly lp, then10:35
TakI'm really surprised LP doesn't have that10:36
vilajelmer: so, f, p, c, v, d, n, k, e is a bit obscure :) But more seriously, the doc string says update the file-ids, but I don't see how you acquire the file-ids from the other tree,10:36
jelmermaxb: the revision was dpushed, so it can't use the revision id to see when the MP was merged10:36
maxbah10:36
* jelmer should put some more time into proper roundtripping support in bzr-git10:37
vilajelmer: oh, 'f' is the file-id, so target_tree.iter_changes() should provide them10:38
jelmervila: Aaron wrote that code originally, and it's worked fine before10:38
jelmervila: I'm not entirely sure how then :)10:38
jelmervila: ah :)10:38
maxbbtw in the dulwich case I filed a bug on, some revision ids hadn't been dpushed either10:39
vilajelmer: so, this code looks correct to me, but often with tt, combining multiple operations is where the problems start, do you have a specific one problem with this code ? Or when it's used in conjunction with some other operations ?10:39
vilajelmer: the tt seems to be local to the function though10:40
jelmeryeah, it's all in this function10:40
jelmervila: bug 70776110:40
ubot5Launchpad bug 707761 in Bazaar "'versioning no contents' tree transform error during dpush" [High,Triaged] https://launchpad.net/bugs/70776110:41
vilahaaa10:41
vilajelmer: right, so based on tt.new_file(), you probably need a tt.create_file(contents, trans_id) in *some* cases10:44
vilaemphasis on some, hilarity ensues10:44
vilajelmer: "some" may be when the newly versioned file doesn't exist under the right? path in wt10:46
vila ?10:46
jelmerah, hmm10:47
vilajelmer: you will need more tests for update_workingtree_fileids() it seems :-/10:47
jelmervila: thanks10:47
vilajelmer: sounds likely ?10:47
jelmervila: yeah, somewhat10:48
vilaok10:48
pfarrellis there a bzr equivalent of svn:externals? If I check out one bzr repository, it automatically checks out another?10:50
jelmerpfarrell: not in the core (yet). there are some plugins that provide similar functionality, such as bzr-externals10:50
pfarrelljelmer: oh, right, thanks.10:51
vilahmm, http://launchpadlibrarian.net/63287267/buildlog_ubuntu-hardy-lpia.pristine-tar_1.11ubuntu1~pkgimport1_MANUALDEPWAIT.txt.gz10:55
vilafails on debhelper(inst 6.0.4ubuntu1 ! >= wanted 7.0.50)10:55
vilaI suspect I'm running into an issue known by maxb... Is https://launchpad.net/~bzr/+archive/builddeps part of the asnwer ?10:56
vilaanswer10:56
vilaexcept the later includes only debhelper-7.0.1310:56
jelmervila: is there any reason you actually need debhelper 7.0.50 ?10:56
jelmeras opposed to an older version, I mean10:57
vilajelmer: no idea, this is required by pristine-tar, do you suggest I should try to lower the requirement and see ?10:57
vilajelmer: hardy has debhelper 6.0.4, -backports has 7.0.13 as does bzr-builddeps, so lowering to 7.0.13 and add bzr-builddeps as a ppa dependency ?11:04
maxbvila: most dh7 stuff does actually require 7.0.5011:06
maxblook for override_* targets in rules11:07
maxbthey are the most common reason11:07
vilamaxb: two occurrences for pristine-tar: override_dh_auto_configure and override_dh_auto_clean11:08
maxbright, so you do need a later debhelper than backports provides11:08
vilamaxb: can debhelper be upgraded >= 7.0.50 in https://launchpad.net/~bzr/+archive/builddeps ?11:09
vilamaxb: I'm pretty sure I'll have to add it as as dependency to https://launchpad.net/~vila/+archive/pkgimport anyway11:09
=== wgrant_ is now known as wgrant
maxbah so we've stopped trying to sru pristine-tar for jubany?11:10
vilamaxb: that's different, I'm trying to setup a local package importer and doing so track what is needed11:11
vilamaxb: I thought prisitine-tar has been upgraded on jubany anyway, I didn't know about an sru for it...11:11
maxbyou can find a suitable debhelper in mercurial-ppa/builddeps11:12
vilamaxb: could you copy it to bzr.builddeps ?11:15
vilamaxb: could you copy it to bzr/builddeps ?11:15
vilamaxb: or will it break everything there ?11:15
maxbI think it should be pretty safe11:17
maxbThe only reason I did not before was that I did not have a need11:17
* maxb blinks at bzr-package-importer being a package11:18
maxbDoesn't it just run from the branch in production?11:18
vilamaxb: blame me11:18
vilamaxb: I'm creating it right now to track what is ~used in production11:19
vilamaxb: it is *not* used by jubany11:19
maxbok11:20
maxbWell, I don't have any specific objections to copying debhelper 7.0.52 to bzr/builddeps - except that there's been no requirement for it for anything built in the ~bzr PPA so far. Perhaps you could just copy it to vila/pkgimport directly?11:21
vilamaxb: yup. I was going to do exactly that11:22
maxbAlthough, wouldn't your project be easier, and more representative of production, if you based on lucid?11:22
vilamaxb: well, jubany is hardy right now...11:22
maxb*blink*11:22
maxbI am confused. Or perhaps I misunderstood. I thought the whole point of considering SRUing pristine-tar to lucid was to get it to jubany11:23
jelmerI don't think there is any intent to do a SRU?11:23
vilameh, no idea, as I said, I'm not aware of the SRU, any pointer ?11:23
maxbSomewhere there was a mention by (I think) james_w that we should do a backport. I filed a backport request bug, which got declined on the basis that it should be a SRU instead11:26
maxboh, it's in an import failure bug11:27
* maxb looks11:27
vilamaxb: jubany currently uses 1.11ubuntu1~0.IS.8.0411:27
jelmermaxb: are you sure that's for the package importer?11:28
maxbOh. That's recent, then11:28
vilamaxb: yes, less than 24h11:28
maxbEvidently someone got tired of waiting and did an IS backport instead11:28
vilamaxb: jam will know the details11:28
maxbbug 69510811:28
ubot5Launchpad bug 695108 in lucid-backports "Backport pristine-tar 1.11ubuntu1" [Undecided,New] https://launchpad.net/bugs/69510811:28
maxbbug 65330111:29
ubot5Launchpad bug 653301 in Ubuntu Distributed Development "Packages failing due to pristine-tar not being able to reconstruct their tarball" [High,Triaged] https://launchpad.net/bugs/65330111:29
vilamaxb: right, so s/24/13/11:29
vilamaxb: right, so s/24h/13h/11:29
jelmerah, so it affects general bzr-builddeb as well11:35
vilaas a related note, should add bzr-builddeb to the bzr ppa(s?) ?11:36
vilas/add/we add/11:36
jelmeryeah, probably11:36
vila*blinks*11:38
vilaIt *is* in bzr/ppa but for jaunty/karmic/lucid only...11:38
maxbvila: That typically means that maverick+ is already at the latest upstream release11:59
jelmerit's about time we do another bzr-builddeb release11:59
vilamaxb: of course, silly me ! Thanks12:00
maxbOh, and it's not there for hardy because we're have to backport python-debian, and it didn't seem worthwhile12:00
vilamaxb: very good exercise for me :)12:02
maxbmeh, hardy is ancient12:02
maxbI wonder when PPAs are discontinue support for Jaunty12:03
maxb^ going to12:03
vilamaxb: but that's what jubany uses *today*, on the other hand may be I should check what is the target for migrating jubany (probably lucid) and just works from there...12:04
maxbWhat does the importer need builddeb for?12:04
jelmermaxb: it uses a bunch of the tarball importing code from bzr-builddeb12:08
maxbah12:08
maxboh, duh, I should have remembered that12:08
=== oubiwann is now known as oubiwann_
vilaok, confirmed, so I'll target lucid instead and see how it goes12:14
deepestthought42hi all! I'm evaluating how to best use bzr for revision control at my company. We have a medium sized Visual Studio Project that depends on a few binary files, which seldom change. Is there a way to just copy the files on branch/merge (direction depending on timestamp) commands , without having them version controlled ? Thanks!12:19
=== oubiwann_ is now known as oubiwann
jelmerhi deepestthought4212:34
Takdeepestthought42: from my research, no current dvcs has "good" handling of large, versioned binary files12:34
vilaspiv: are you *sure* 2.1.1 is not relevant when bug #522637 has been fixed in 2.1.3 ?12:40
ubot5Launchpad bug 522637 in Bazaar 2.0 "BzrCheckError: Cannot add revision(s) to repository: missing referenced chk root keys" [High,Fix released] https://launchpad.net/bugs/52263712:40
vilamwahaha, bzr-builddeb package imported failed leading to out-of-date branches on lp which I use to create my own13:05
jelmerhehe13:05
deepestthought42I feared as much , but thanks anyway. We'll probably end up putting them under vc.13:10
viladeepestthought42: what do you call large (# and size of the largest) ?13:11
deepestthought42vila: I do not think I said how large they are ;) but the complete build folder has about 350 MB (Debug, release builds etc.) -- the real "problem" is that changed binaries crop up in the status/diff/merge and they probably slow the system down (not sure on that),13:19
vilaoh right, sry, but why don't you *ignore* the binaries (via 'bzr ignore') i.e. don't version them and they won't appear in status/diff/merge13:21
deepestthought42not all of them need to be build (and can be by all developers)  every time but need to be present.; so a copy would suffice for them; we probably will have a folder for the stable binaries and version them and ignore the unstable ones13:23
vilaha... Well, your call, but mixing production and version control has known deficiencies, keep in mind that bzr will change the timestamps of the files it modify so rebuilding an old version should only rebuild the files related to the modified files13:26
vilaIn practive, devs will have to build the whole project once and then rebuild only the needed parts, even when working on old versions13:27
deepestthought42vila: you're right, this solution is not without problems -- but when completely ignoring the binaries, we would have to copy them by hand on every branch etc.13:42
viladeepestthought42: you want to try 'bzr switch' then so you can reuse the same working tree for several branches13:44
viladeepestthought42: but you're the judge, just mentioning some different ways to address the issue13:45
deepestthought42vila: i know and thank you for your help :)14:02
=== oubiwann is now known as oubiwann_
fenrigCould someone give me good guide on howto set up a bazaar server over http on linux?14:37
AfCfenrig: do you mean "just access a branch over HTTP" or the magic bzr+http integration?14:45
fenrigAfC: uhm bzr+http is where bzr doesn't get whole files but just the diff lines?14:46
cbzno14:46
fenrig:o uhm okay14:48
AfCfenrig: bzr always does that (sic) regardless.14:48
AfCfenrig: ie, it Does The Right Thingâ„¢ as it should. You rarely need to second guess it.14:48
AfCfenrig: have you got SSH access to the web server in question?14:49
fenrigAfC: ow okay I compare GIT a lot with BZR.14:49
fenrigAfC: I have yes :)14:49
AfCfenrig: if so, just push your branch there via bzr+ssh://14:49
AfCfenrig: and then you can just point people at http://...14:49
AfC[there's also a sftp:// for pushing if you can't install Bazaar on the server]14:50
fenrigbut then http acts like a read only branch?14:50
fenrigAfC: Do u guys have a super good guide, so I can try it out on a VM?14:52
AfCfenrig: yes14:53
fenrigAfC: :p could you please give it to me :D14:54
AfCI said yes to "read only"14:55
jammaxb, vila: you rang?14:56
AfCMaybe someone else could lend this person a hand? Rumour has it Bazaar has good documentation, but apparently they haven't been able to find it :(14:56
=== AfC is now known as AfC|zzz
vilajam: morning jam, maybe, long ago, let me check :)14:56
maxbjam: There was a discussion about pristine-tar for jubany, but I think we got everything clarified in the end.14:56
vilaha, yeah, pristin... what maxb says :)14:56
jammaxb: lamont was kind enough to backport the natty pristine-tar and install it on jubany14:56
jamit didn't fix everything, but it fixed a lot of them14:56
maxbfenrig: Please clarify: you want to do write-access to branches over http? You want to browse branches like you see at http://bazaar.launchpad.net/~bzr-pqm/bzr/bzr.dev ?14:57
fenrigmaxb: no with loggerhead is fine :) but then I need to have ssh+bzr to commit changes?14:58
vilafenrig: there is nothing to configure for bzr+ssh except for the ssh access14:58
jamvila: looks like it went from ~92 to 14 failing packages14:59
maxbfenrig: Many people prefer bzr+ssh for commit because a ssh-agent is often a more convenient way to cache your authentication safely than a password14:59
vilafenrig: not even a vm, you can try with bzr+ssh://localhost14:59
vilajam: yup, well done, I didn't look closely but had a ~60 rough estimate14:59
fenrig:D okay maybe someone could point me to a good guide on how I have to do this (and please don't give a ubuntu specific cause I use arch linux)15:00
vilafenrig: just try: 'bzr push bzr+ssh://localhost/~/a-new-shiny-one'15:01
fenrigvila: I mean how to setup a server :p15:01
vilafenrig: I meant: just try15:01
vilafenrig: there is no server to set up !15:02
maxbIf you have a running sshd, and bzr installed, that's all you need.15:02
maxbDoes anyone fancy dispatching https://code.launchpad.net/~maxb/bzr/ppa-doc-update-2/+merge/48101 to PQM? (it's already approved)15:02
fenrigso let us say :) just to understand i do :o15:03
fenrigbzr push bzr+ssh://root:localhost/~/a-new-shiny-one15:03
vilamaxb: done15:03
maxbthanks15:03
fenrigwhere does the folder goes to?15:03
fenrigin /root/a-new-shiny-one?15:03
vilaroot:locahost ? You mean root@localhost ?15:03
fenrigvila: yeah sorry XD15:04
vilafenrig: hmm, don't use root for that, just try with your regular user15:04
fenrigyeah I know using root bad idea, but it's for understanding the semantics :o where does the repo folder go to?15:04
vila~ is replaced with the user home directory yes15:05
mgzjelmer is launching a DoS on my inbox...15:06
vilafenrig: the *branch* is created there, creating a new repository or re-using an existing one (you may want to read http://wiki.bazaar.canonical.com/MatthewFuller/SpotDocs/PiecesInBrief)15:06
vilamgz: hey !15:06
fenrigvila: so i could find all the source code files in "/root/a-new-shiny-one"?15:06
vilamgz: yeah, it's a new kind of Ddos: single attacker, multiple targets :)15:06
mgz:)15:07
vilafenrig: no, you won't find the working tree, only the history (branch [+ repository])15:07
mgzmaybe I should blame launchpad instead, does it really need to send me email for tag changes.15:08
fenrigvila: how do you mean (your url says: "page does not exist,...")15:08
vilafenrig: most of the time working trees are useless on servers, if you need a working tree there, look for the bzr-push-and-update or bzr-upload plugins depending on your use case15:08
vilafenrig: try again, I copied the URL from my browser15:08
fenrigvila: there was a ")" behind it sorry xD15:09
vilaargh, sry for that15:10
fenrigvila: don't mind it :D15:13
fenrigbzr is easier to setup than git isn't it?15:17
cbzyes15:20
cbzmostly15:20
cbzand easier to work with mostly15:20
=== beuno is now known as beuno-lunch
fenrigcbz: the "bzr whoami" command gives you a name on your client :) so If I and my friend use diff whoami's but we use the same ssh user there should still be a difference in bzr?16:08
vilafenrig: whoami is used at commit times, not at push time16:16
fenrig:o so the diff will we marked with the whoami?16:17
vilafenrig: yes, whoami set the committer16:17
fenrigI'm following thui16:24
fenrig*this guide: and he creates a user like this => useradd --create-home --home-dir /var/local/bzr --shell /usr/lib/sftp-server bzr (on ubuntu)16:25
fenrigwhy is he setting the home-dir to be /var/local/bzr?16:25
fenrighttp://wiki.flexion.org/BazaarServer.html16:25
vilafenrig: no idea, but given he mentioned hardy and doesn't use the smart server, I'll forget about it16:26
fenrigvila: :o where do I have to find a proper guide then?16:27
vilafenrig: you can use bzr over sftp, but you don't have to.16:27
vilanowhere16:28
vilathere is no guide to setup an ssh smart server because there is no setup16:28
vilaas maxb said earlier: install sshd and bzr and you're done16:28
fenrigyeah okay :o16:28
fenrigbut I want to make one bzr ssh user for this :o16:29
vilafrom there it's only ssh config, nothing specific to bzr (at least to start with)16:29
fenrigcalled (tadam) bzr16:29
vilajfdi16:29
vilait's not a bad idea as you will be able to set its .ssh/authorized_keys to control who can push there16:29
=== Meths_ is now known as Meths
fenrigwhen doing "bzr push bzr+ssh://bzr@192.168.56.101/~/a-new-shiny-thingy-one"16:48
fenriggives me a : "bzr: ERROR: Connection closed: Unexpected end of message. Please check connectivity and permissions, and report a bug if ..."16:49
fenrigbut loggin in with16:49
fenrigssh bzr@192.168.56.101 works perfectly :o16:49
vilafenrig: try 'ssh -vv bzr@192.168.56.101' to debug ssh issues16:49
vilaha, hmm16:50
fenrigvila: ssh -vv bzr@192.168.56.101 works :o logging in and all :o16:53
fenrigvila: but I'm using a modified "shell" => /usr/lib/ssh/sftp-server16:54
viladon't do that then16:55
vilabzr will send the right ssh command, you're getting in its way here16:55
fenrigvila: what's the command to change the shell of a user XD16:55
vilahow did you modify the shell ?16:56
fenrigu configured it using adduser16:56
fenrig*I16:56
fenrig(sorry)16:56
vilaby following the guide I told you was wrong ? :D16:57
fenrigI only followed it on the adding bzr user :$16:58
viladunno the specific command on your os, *I*'d modify it by editing /etc/passwd16:58
vilaor you can delete the user and re-create it or create another one16:58
fenrigvila: change it to /bin/bash?16:59
vilawhatever is the default on your system16:59
=== beuno-lunch is now known as beuno
jamvila, fenrig: the command is often just "chsh" for change shell17:08
jamYou often can run chsh without needing root17:08
jmljelmer: are you retagging all of the bugs?17:08
jelmerjml: I'm tagging the ones that haven't been tagged yet and closing/duping where possible17:09
jmljelmer: ahh, ok.17:09
jelmerjml: Sorry about the mail. I'm sure you get plenty already ;)17:10
vila. o O (Yeah, that's the idea, bounce them all to jml !)17:10
jmljelmer: no worries. it's just an unusually high number today17:11
jelmervila: at least he's somebody who can make sure that launchpad bug notifications get fixed :)17:12
vilajelmer: you get the idea ;)17:13
vilajames_w: ping17:13
james_whi vila17:13
vilajames_w: hey ! wow, that was fast ;)17:14
james_wI've been sitting here all day waiting for your ping17:14
vilaI've set up a local package importer (with --no-push), and I'm trying to add some packages to it17:14
vila:)17:14
vilaI tried add_import_jobs.py but it timeouts17:15
james_wtimes out doing what?17:15
vilaso my question is: is there another way to add a package (a single one to start with :)17:15
james_w./requeue_package.py should do it17:15
vilait says package has not failed, oh, --force ?17:16
james_wyeah17:16
vilayeah !17:16
vilajames_w: thanks, I'm unblocked17:16
cr3how can I branch a project in launchpad on system that doesn't have any access to bazaar.launchpad.net? if I can access the system by ssh, can I push a local branch to the system in a way that can be merge on the same remote system later?17:17
james_wcool17:17
vilacr3: if you have an ssh access to a system that have an ssh access to b.l.n, why not set up an ssh tunnel ?17:21
cr3vila: I did that once, I was hoping for another solution :)17:22
fenrigvila: changing shell worked :D17:23
vilacr3: hehe :)17:23
vilafenrig: finally !17:23
vilacr3: so, anyway, as long as you do the merge on 'system' you can still push there from wherever works for you17:23
vilacr3: you don't need a working tree in the branch you're pushing to as long as you have one where you merge this branch17:25
vilas/you don't need/don't use/17:25
cr3ssh -g -R 50022:bazaar.launchpad.net:22 system; bzr branch bzr+ssh://localhost:50022/...17:32
vilajames_w: add_imports_jobs.py is the canonical way to bootstrap the importer or something else ?17:47
james_wvila, that's what adds all the jobs as new packages are uploaded :-)17:47
vilajames_w: so it's run from a cron job ?17:47
james_wyep17:47
vilaok17:48
vilaoooooh here is the crontab :)17:49
fenrighowdo I download a full branch?18:01
fenrigno with pull right?18:01
beunofenrig, "bzr branch"18:05
fenrigthx :D18:07
bregmahey all, I keep having a problem with bzr merge-upstream deleting my debian directory in my packaging branch ... any ideas what I've done wrong?19:00
maxbbregma: It sounds like the best way to explain would be to provide instructions for someone to repeat your steps19:04
bregmahmm, okay, I'll try to describe what I've done...19:05
bregmaI have a packaging branch for my package that I created by branching my package, then I added packaging (the debian/* files) and committed...19:08
jelmerbregma: does your previous upstream revision perhaps contain the debian/ directory?19:08
bregma.. I then did a bzr mu, which kindly removed and readded all my upstream files and updated the debian/changelog...19:09
bregma.. debcommit, fix some packaing problems, debcommit, good to go19:10
fenrigshould I add my user for bzr+ssh to the group users or should I create a new group for it (bzr for example)?19:11
bregma... now, I have a new upstream release... I use uscan to get the tarball, then do a bzr mu, referencing my upstream repo, and the mu removes the debian directory and fails because there is no debian directory19:11
bregmaI have other projects that use bzr mu OK, but I tried bootstrapping this one on my own and now I get fail19:15
fenrigshould I add my user for bzr+ssh to the group users or should I create a new group for it (bzr for example)?19:15
fenrigHi :o19:21
fenrighow do i specify the port if the port of ssh is another then the default (22)19:21
fenrigbzr --create-prefix bzr+ssh://bzruser@192.168.1.1:8888/~/project ?19:22
fenrigI've got it sorry xD19:23
maxbbregma: It would be a lot easier to understand if you just pointed us to the branch and tarball in question19:24
bregmamaxb, indeed, branch lp:~utouch-team/utouch-compiz/ubuntu and use uscan to grab the tarball19:27
bregma... and the upstream branch is lp:utouch-compiz19:29
maxbbregma: ok, could you say the exact bzr mu command you are running?19:31
maxbWell, first things first, this packaging branch is pretty screwed up19:34
maxbIn fact, I think you should throw this packaging branch away and start afresh19:36
bregmaheh, OK, how should I start?19:37
maxbWas 0.1.1-0ubuntu1 an actual upload to a PPA or something?19:39
bregmayes19:39
bregma.. except UNRELEASED was tweaked to natty for the PPA upload19:40
maxbThat shouldn't be possible with a debian/change.... ah19:40
maxbOK, so here's what I would do19:40
maxbI'd start a new branch branching from -r tag:v0.1.1 of the upstream branch19:40
maxbI'd use bzr import-dsc to import the 0.1.1-0ubuntu1 package precisely as it is in the PPA19:41
maxbthen I'd check the tags and ensure that the imported package was tagged "0.1.1-0ubuntu1", and the upstream version was tagged "upstream-0.1.1" -- probably needing to add that second one manually19:42
maxbAt that point, I'd manually copy across the debian/ directory from the old packaging branch, and commit those changes19:42
maxbAnd *then*, I'd go to do a merge-upstream, and expect it to work19:42
maxboh, and when I copied across the debian/ directory, I'd avoid reverting the old changelog entry to UNRELEASED, just for clarity's sake19:44
bregmaOK, I am trying all that, I will post results19:44
bregmaok, good news, I merged my new release OK and can continue from here, but I still have a problem bootstrapping a packaging branch for use with merge-upstream ... is there a godd resource for that that somewhere that I've missed?19:57
maxbThe simplest way that I know of is to simply branch the upstream branch at the last release, do "bzr tag upstream-VERSIONNUMBER", and add and commit a debian/ dir.20:03
speakmanis it possible to create a set of patch files, one for each commit, of the last five commits?20:22
maxbfor i in `seq 1 5`; do bzr diff -c -$i > patch-$i.patch; done20:28
speakmanomg...20:28
speakmanthen it won't be named by commit message?20:29
jelmerspeakman: generally when transferring revisions it's down as a bundle file, which can contain multiple revisions and their metadata20:30
speakmanjelmer: how do I cherry-pick commits into (or out of) a bundle?20:32
speakmanand how do I inspect a bundle?20:32
jelmerspeakman: generally you'd pull it into a branch and then work from that branch20:33
jelmerthere has been some work to be able to treat a bundle as a branch as well, but that's nowhere near complete yet20:33
speakmanok20:33
speakmanhow do I uncommit a specific commit?20:33
jelmerspeakman: "bzr uncommit"20:34
speakmanany commit?20:35
jelmeryou can only uncommit from the tip20:35
jelmerwith -r you can uncommit until a specific revision20:35
speakmancan I cherry pick from a branch?20:42
speakmanwithout merge is preferred20:42
jelmeryou can cherrypick a revision with "bzr merge -c REV"20:43
mwhudsonjelmer: wow, i have a LOT of bugmail from you!20:50
jelmermwhudson: sorry!20:51
mwhudsonit's ok, it's easy to skim :)20:51
speakmanmaxb: crazy, your one-liner created *large* patch files. But doing exactly the same manually works.21:33
mwhudsonsome of my branches on launchpad appear to have become corrupted21:38
mwhudsonpushing fails with21:38
mwhudsonbzr: ERROR: Server sent an unexpected error: ('error', "Cannot lock LockDir(lp-87934032:///~mwhudson/offspring/path-independence/.bzr/branchlock): File exists: u'/srv/bazaar.launchpad.net/mirrors/00/06/3f/75/.bzr/branch/lock': [Errno 17] File exists: '/srv/bazaar.launchpad.net/mirrors/00/06/3f/75/.bzr/branch/lock'")21:38
mwhudsoninfo says this:21:38
mwhudsonShared repository with trees (format: unnamed)21:38
mwhudsonLocation:21:38
mwhudson  shared repository: bzr+ssh://bazaar.launchpad.net/~mwhudson/offspring/path-independence/21:38
mwhudsondoes this ring any bells with anyone?21:38
jelmermwhudson: that suggests the branch has disappeared21:39
jelmerwhat happens if you remove that lock?21:39
mwhudsonjelmer: the .bzr/branch directory is there21:39
jammwhudson: but if the 'lock' directory is missing, we'll fail oddly trying to create something underneath it21:39
jam(namely .bzr/branch/lock/pending-XXXX eventually renamed to .bzr/branch/lock/held)21:39
mwhudsonjelmer: when i fixed another branch by rmtree-ing .bzr/branch/lock with hitchhiker, it worked21:39
jammwhudson: rmtreeing everything *under* lock seems ok21:40
mwhudsonjelmer: i guess _something_ has gone missing which makes bzr think there is no branch there21:40
jambut deleting 'lock' itself is dangerous21:40
mwhudsonbut in fact, there are bits of a branch there21:40
jammwhudson: right, I think the branch is still there, just that the lock dir is gone, and we don't create it on demand21:40
mwhudsonjam: lock is empty21:40
jambut it does exist?21:40
mwhudsonjam: i think you're reading the error backwards21:40
jammwhudson: it says "FileExists" but I don't trust our error codes for many things21:41
mwhudsonthe error is complaining that the lock dir is already there when it tries to create it21:41
mwhudsonjam: oh heh21:41
mwhudsonjam: the lock dir is there, yes21:41
mwhudsonwhat has to be there for bzr to think there's a branch there?21:41
mwhudson.bzr/branch/format is there21:41
spivThe ".bzr/branchlock" part of that error is intriguing.21:42
mwhudsonas is21:42
mwhudsonbranch.conf21:42
mwhudsonformat21:42
mwhudsonlast-revision21:42
mwhudsonlock21:42
mwhudsontags21:42
jammwhudson: yeah, I'm in on sftp right now21:42
mwhudsonspiv: hm yeah21:42
spivThat's possibly just an error not being serialised for the wire very well, though.21:43
pooliehi spiv, jelmer,21:44
mwhudsonspiv: yeah, locking over http appears to get the same sort of erro21:44
jelmer'morning spiv, poolie21:44
mwhudsonrussel appears to have had the same issue as me though: http://osdir.com/ml/bazaar/2009-10/msg00072.html21:44
mwhudsonah21:45
mwhudsonthe branch is stacked on a branch that has changed url21:45
mwhudsoni suggest the error reporting is not perfect here?21:46
jelmermwhudson: you have high standards for error messages.21:50
speakmanIs it "bzr rewrite" or "bzr rebase" these days?21:57
pooliejelmer, you flooded my mailbox :)21:58
speakmanNow I've moved some lines in a file, but bzr think I've moved all the other lines which makes a very confusing diff. How can I change how bzr detects changes?22:03
pooliespeakman, it prefers to synchronize on unique or unusual lines22:04
speakmanbut it doesn't reflect my actual change22:04
speakmanis there a way to change the behavior+22:05
jelmerspeakman: bzr rewrite22:05
poolienot built in22:05
poolieyou could use an external diff22:05
jelmerpoolie: I get that a lot today :)22:05
vilajelmer: I caught up, send me more :-P22:09
vilaspiv: in case you missed it:22:16
vilaspiv: are you *sure* 2.1.1 is not relevant when bug #522637 has been fixed in 2.1.3 ?22:16
ubot5Launchpad bug 522637 in Bazaar 2.0 "BzrCheckError: Cannot add revision(s) to repository: missing referenced chk root keys" [High,Fix released] https://launchpad.net/bugs/52263722:16
jelmervila: hehe22:16
jelmervila: Thanks for those followups, btw22:16
vilajelmer: thanks to you for the triaging !22:17
mgzI wrote an imap script in the end, to keep up...22:23
mkanatpoolie: Hey, I finally wrote up that email about my community research as a blog post: http://www.codesimplicity.com/post/open-source-community-simplified/22:26
peitschiemkanat: thats a very nice write-up!22:33
mkanatpeitschie: Thanks!! :-)22:33
peitschiemkanat: out of interest.... how long did it take to put together all the data and do the analysis?22:34
mkanatpeitschie: For the Retaining part, I'd say a few weeks.22:34
mkanatpeitschie: A lot of the graph analysis I did in one day, but then correlating it to what was happening at the time was more difficult.22:34
mkanatI also generated the graphs in a *lot* of different ways to make sure that I wasn't mis-reading the data.22:35
mkanatpeitschie: The "removing the barriers" stuff I'd say was more an obvious fact that just became apparent after 5 years on the project and everybody being confused about how they should start.22:37
pooliejelmer, i was wondering how you were retagging things, and how/whether you found it worthwhile22:39
jelmerpoolie: the main reason I'm retagging is to get a bit of an idea of what's still out there in terms of bugs and to make it easier to find related bugs when working on a specific topic later.22:41
jelmerpoolie: I'm mainly tagging based on the top-level commands in which something occurs, if that's significant or otherwise the protocol / format / platform that it's related to.22:43
poolieare you using the web ui?22:43
pooliei think the tags are accurate and useful22:43
pooliei have mixed feelings about whether it's worth going through and gardening them22:43
jelmerAs well as a few overall themes (udd, ui, foreign, ...)22:43
pooliebut as a way to page it into your head it's quite good22:43
jelmerpoolie: I've got a lplib script that finds interesting bugs for me to look at, and feeds them to chromium22:44
poolieah, interesting22:45
pooliecan you share it, maybe on launchpad@lists?22:46
jelmersure22:46
jelmerit's only 5 lines though, so not terribly interesting :)22:46
poolieit's just "all bugs" or "bugs without tags?"22:46
AfCmkanat: Excellent post. I have passed it along and have already started thinking about what we can apply to our project.22:46
poolieor you have some local state of ones you're already seen?22:46
mkanatAfC: Awesome, thank you! :-)22:47
AfCmkanat: My work is an order of magnitude smaller, but I've observed similar patterns.22:47
pooliejam: https://bugs.edge.launchpad.net/kanban22:47
* mkanat nods.22:47
jelmerpoolie: it's bugs without interesting tags (uninteresting tags being things like "apport")22:47
mkanatAfC: I think it's macrocosmic and microcosmic too.22:47
mkanatAfC: You could probably apply it to "the open-source community as a whole," too.22:47
AfCmkanat: the one I found particularly bell-ringing was "what can I do", and I'm not sure we actually answer that22:47
AfCmkanat: barrier to entry stuff was a big deal early on when I was learning to be a maintainer, too22:48
mkanatAfC: Yeah, for me too. :-)22:48
AfCNo one ever tells you abut that part22:48
mkanatAfC: Yeah. I think the only reason I became a long-term part of the project was that I entered with a defined long-term goal.22:48
mkanatThat was my own goal.22:48
pooliejelmer, and then you just get 20 browser tabs or whatever to overlap the page load times?22:49
jelmerpoolie: More like a 100, but yeah :)22:49
mkanatAfC: Also, I was naturally very meticulous and willing to accomplish that long-term goal as a series of smaller steps.22:49
AfCmkanat: (not horn blowing) the second half of http://blogs.operationaldynamics.com/andrew/software/java-gnome/love-your-work.html you'd see that I have quite the "high" standard for getting code in, and you can imagine the knock on effect of that.22:49
mkanatAfC: Hahaha, I totally do too!22:50
mkanatAfC: People have often complained that the review process was too hard. But nobody complaints that the code sucks, anymore. So....22:50
mkanatAfC: And as I said in the blog, nobody cited the *difficulty* of the process as their actual reason for *leaving*.22:50
AfCmkanat: one of my problems (I think I will blog this today) is that people turn up "what can I hack on" and I tend to reply "um, maybe you should try *using* the library first. Then we can talk about what you might do to help improve it"22:50
AfCmkanat: yes, that was interesting too22:51
AfCmkanat: though in the Apache world, no one has any difficulty with code review at all. So sometimes people don't expect pushback. Anyway.22:51
mkanatAfC: Ahh. :-)22:51
mkanatAfC: Yeah, I do think that developers should be users first.22:51
AfCmkanat: I'm pretty happy not to follow the Apache worldview, but it does have knock-on consequences22:51
mkanatAfC: Yeah.22:52
mkanatAfC: The system we have in Bugzilla is that certain people can CTR in modules that they "own", but everybody else, it's RTC.22:52
mkanat(For everybody else in the channel who doesn't work on Apache, that's "Commit Then Review" vs "Review Then Commit".)22:53
mkanatAlso, our stable branches are always RTC.22:54
AfCInteresting difference in the 3rd generation DVCS world: it's commit, then submit for review, then merge[d by maintainer]22:58
AfC(==RTC, but :))22:58
jammkanat: interestingly, people *have* cited the difficulty of the process as the reason for leaving the launchpad group23:03
jam:)23:03
mkanatAfC: Haha, yeah.23:03
mkanatjam: That's interesting. I would have dug a bit and asked them if their reviews had been *faster* if they'd have felt differently about it.23:03
mkanatI did quite a bit of responding to the survey answerers to understand everything about what they were saying.23:04
jammkanat: as one of the outsiders suffering the q, reviews is one thing, actually getting the whole steps from 'write some code' until 'it is deployed in production' can be a huge q of things.23:04
jamdepends on the size of the hack23:04
mkanatjam: Yeah, I certainly found that frustrating, when trying to get loggerhead deployed on LP.23:05
mkanatjam: I think the whole process of submission to "get it into the product" is what needs to be sped up for every project, ideally.23:05
jammkanat: right. because even if I hack on Evolution or whatever, how long before I actually get to use that on my machine...23:06
jam(without having to run manually compiled binaries indefinitely.)23:06
mkanatjam: Totally.23:06
mkanatjam: It's easier for something written in a dynamic language.23:06
mkanatjam: Particularly for a web app that people can run themselves.23:07
mkanatjam: They can just "bzr pull" and they have their fix.23:07
jammkanat: a lot of that depends on the design of the app, and how it can be run23:07
jamrun from source23:07
mkanatBut even in that case, getting the actual release out is a big deal.23:07
mkanatjam: Yeah, totally true.23:07
jamneeds to be configured and installed, etc.23:07
mkanatjam: That's one reason why I've always worked to make it easier and easier to install Bugzilla, too.23:07
mkanatjam: But something like bzr or launchpad, you realistically need to see a release before you can actually use your feature.23:20
jammkanat: I run from bzr.dev constantly23:22
jambut launchpad def needs a rollout23:22
mkanatjam: Yeah.23:22
mkanatjam: Although most people aren't going to use an unstable version of a VCS, because it's so important.23:22
dev001hi.  i'm using lp:bzr/2.3.  today's update of plugins squawks abt 'Installed Bazaar version 2.3.0dev6 is too old to be used with plugin "Bzrtools" 2.4.0.', where I've been tracking lp:bzrtools.  so, a switch to 'other' bzrtools branch is called for, i s'pose.  which branch?23:23
dev001ping abentley23:25
abentleydev001, pong23:25
dev001abentley: hi.  ^^^ re: "your" (well, at least you're the maintainer :-)  ) bzrtools ?23:26
dev001am i stuck 'inbetween' API upgrades, or is a branch switch called for?23:26
abentleydev001, if you want to track trunk branches, you should track both the trunk of bzr and bzrtools.23:26
dev001abentley: nah, i got warned off bzr trunk a while ago.  so if i'm tracking bzr/2.3, which bzrtools?23:27
dev001trunk worked for awhile ...23:27
dev001but, apparently no longer23:27
abentleydev001, I happen to be in the middle of creating a 2.3 branch, but I don't guarantee I'll do that for future releases.23:28
abentleydev001, if you're not tracking trunk, you might be better off with packages.23:29
dev001abentley: your point's noted.  but a number of issues were addressed solved in bzr/2.3 for me, per admonition from in here.  or are you suggesting packages for *plugins/extension* with bzr/2.3 branch?23:30
pooliehi abentley, afc, mkanat23:30
mkanatHey poolie. :-)23:30
abentleydev001, I'm suggesting packages for bzr 2.3 and bzrtools.23:31
abentleypoolie, hi.23:31
dev001abentley: hm.  catch22, then.23:31
abentleydev001, why?23:32
dev001abentley: simply (admittedly, naively), the move from bzr pkgs to bzr/2.3 branch was something i did cuz told in here to do so (whining abt some such problem; the migrate fixed it).23:33
dev001so prior-necessity dictates (dictated?) the bar/2.3 branch23:34
dev001er, bzr23:34
abentleydev001, I don't think that packages of bzr 2.3 would introduce any problems that the 2.3 branch doesn't have.23:34
abentleydev001, anyhow, lp:bzrtools/2.3 now exists..23:34
dev001abentley: heh, well there's THAT solution!  thanks :-)23:35
abentleydev001, np23:36
* dev001 appreciates NOT having to use git muchly! ;-)23:37
dOxxxjelmer: I think I've received nearly a 1000 emails today, courtesy of you via launchpad.23:51
* maxb wonders if poolie is still around?23:55
maxbIf so, could you nod at https://code.launchpad.net/~maxb/bzr/launchpadlib-service-root-api-compat/+merge/47885 and possibly send it to PQM?23:56
pooliemaxb, hi23:57

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