/srv/irclogs.ubuntu.com/2007/09/22/#bzr.txt

=== dewd [n=dewd@201009147182.user.veloxzone.com.br] has joined #bzr
mthaddonLaunchpad is going down in 15 mins for a code update. Estimated downtime is approx 1 hour12:21
=== radix [n=radix@70.91.133.157] has joined #bzr
=== niemeyer [n=niemeyer@200.140.230.150] has joined #bzr
=== fog [n=fog@debian/developer/fog] has left #bzr []
lifelessvila: hi12:42
=== radix [n=radix@70.91.133.157] has joined #bzr
lifelessvila: two things, firstly you can only delete the line if its the last line12:42
lifelessvila: if its not the last line you break dictionary references12:42
=== michelp [n=michelp@69-30-72-119.dq1sf.easystreet.com] has joined #bzr
lifelessvila: secondly, please keep NEWS in alphabetical order as per the list thread a few weeks back.12:43
=== radix [n=radix@70.91.133.157] has joined #bzr
=== asabil [n=asabil@ti0035a340-0469.bb.online.no] has joined #bzr
=== radix [n=radix@70.91.133.157] has joined #bzr
=== lapthrick [n=mathrick@users.kollegienet.dk] has joined #bzr
=== rml [n=Skippy@78.32.35.169] has joined #bzr
=== duckx [n=Duck@tox.dyndns.org] has joined #bzr
PengYay!01:21
Peng10 points to Launchpad for using a "503 Service Temporarily Unavailable" for the maintenance page.01:22
=== duckx [n=Duck@tox.dyndns.org] has joined #bzr
=== michelp [n=michelp@69-30-72-119.dq1sf.easystreet.com] has joined #bzr
=== besonen_mobile2 [n=besonen_@71-220-234-148.eugn.qwest.net] has joined #bzr
=== igc [n=igc@ppp121-45-206-141.lns1.bne1.internode.on.net] has joined #bzr
=== Demitar [n=demitar@c-212-031-182-147.cust.broadway.se] has joined #bzr
ubotuNew bug: #141629 in bzr ""bzr reconfigure" with no arguments throws an exception" [Undecided,Fix committed]  https://launchpad.net/bugs/14162902:30
=== J-Unit [n=jdong@SIMMONS-THREE-SIXTY-FIVE.MIT.EDU] has joined #bzr
=== orospakr [n=orospakr@bas4-ottawa23-1177770446.dsl.bell.ca] has joined #bzr
=== J-Unit is now known as j-dizzle
=== BasicOSX [n=BasicOSX@216.70.10.130] has joined #bzr
mthaddonLP going down for maintenance in 15 minutes for 1 hour03:43
PengAm I experiencing deja vu?03:44
Peng:P03:44
PengWhat's up with LP?03:44
elmoPeng: we ran into some problems during the previous maintenance  window, so it had to be rolled back.  we've resovled them and trying again to rollout the new code03:46
elmoPeng: sorry for any inconvenience03:46
PengAh.03:51
PengNo problem or anything. I was just curious.03:51
=== statik [n=emurphy@189.66.188.72.cfl.res.rr.com] has joined #bzr
=== mw is now known as mw|out
=== jelmer_ [n=jelmer@h66-201-205-140.gtconnect.net] has joined #bzr
vilalifeless: soooo, I broke my repo dictionary reference because I didn't respect alphabetical order in NEWS... Naah, I can't believe that... Will drink another coffee first07:14
vilalifeless: ok, so, the corrupted revision is the fourth from the end, you're saying I should delete the four to recover my repo. Should I track those revisions in the repository/knits hierarchy too ?07:27
vilalifeless: About NEWS, I saw your first notice, I had read the thread but haven't realized the decision have been taken, I will comply. As soon as I can :)07:29
ubotuNew bug: #141555 in bzr-svn "Breakage with invalid SSL certificates (dup-of: 82086)" [Undecided,New]  https://launchpad.net/bugs/14155507:40
=== liw [n=liw@a91-154-119-10.elisa-laajakaista.fi] has joined #bzr
=== CardinalFang [n=c@217.194.71.122] has joined #bzr
=== NamNguyen [n=namnt@203.162.163.50] has joined #bzr
vilabbib09:08
=== vila [n=vila@lec67-4-82-230-53-244.fbx.proxad.net] has joined #bzr
=== eugene [n=eugene@redhat/eugene] has joined #bzr
=== eugene [n=eugene@redhat/eugene] has left #bzr []
=== rml [n=Skippy@78.32.35.169] has joined #bzr
=== Starting logfile irclogs/bzr.log
=== ubuntulog [i=ubuntulo@ubuntu/bot/ubuntulog] has joined #bzr
=== Topic for #bzr: The Bazaar Version Control System | http://bazaar-vcs.org/ | Bazaar 0.90 and 0.91rc2 are out - http://bazaar-vcs.org/Download | Please complete the Bazaar User Survey - http://www.surveymonkey.com/s.aspx?sm=L94RvLswhKdktrxiHWiX3g_3d_3d
=== Topic (#bzr): set by poolie at Wed Sep 12 03:35:03 2007
kgoetzwin 2010:27
=== ubuntulog [i=ubuntulo@trider-g7.fabbione.net] has joined #bzr
=== Topic for #bzr: The Bazaar Version Control System | http://bazaar-vcs.org/ | Bazaar 0.90 and 0.91rc2 are out - http://bazaar-vcs.org/Download | Please complete the Bazaar User Survey - http://www.surveymonkey.com/s.aspx?sm=L94RvLswhKdktrxiHWiX3g_3d_3d
=== Topic (#bzr): set by poolie at Wed Sep 12 03:35:03 2007
vilalifeless: no, was waiting for a confirmation, trying to reproduce it in clean env, etc12:45
=== duckx [n=Duck@tox.dyndns.org] has joined #bzr
vilacan't reproduce it so far :-/12:46
=== Vernius [n=tomger@p508AC622.dip.t-dialin.net] has left #bzr []
=== phanatic [n=phanatic@dsl54028230.pool.t-online.hu] has joined #bzr
vilalifeless: http://paste.ubuntu-nl.org/38243/   describes the corrupted revision01:12
vilaall zeroes, scary01:13
vilaCould your last tuned_gzip.bytes_to_gzip be related ?01:13
vilaMy suspects so far: hardware problem (but find nothing else to confirm this),01:14
vilaNFS, the repo is on HFS+ on OSX, mounted as NFS, but the commit itself was from OSX01:15
vilayour last modification to tuned_gzip.bytes_to_gzip, but only because it modifies a code that may be related, I found nothing especially suspect in your modification, I just try to enumerate possible causes01:16
vilathis is mainly an annoyance because the repo holds everythin bzr related (including plugins) and it seems many commands try to read that revision even from branches that have nothing to do with it01:17
vilafor safety, I think I will reorganize this whole hierachy in several repos, just because I wanted to do that for quite some time01:18
vilaI lack time to hack as much as I want on this bug, but I may need to at least fix the .kndx (or several ? That's the point I want confirmation on) just to extract the right info (I still have several long lived branches in this repo)01:19
vilaI've made a backup of the whole hierarchy (888MB) and of the repo itself (93MO) and also from the .bzr.log of the two machines that may be involved01:21
vilaAll are available for diagnosis01:21
vilaI lose some time doing that because tar suddenly told me 'file change while we read it' that scared me and made me think a little bit longer that I had an hardware problem (doing two consecutive tar and comparing them with cmp yielded ~3000 differences)01:23
fullermdSee what happens when you step away from the computer for a couple weeks??01:24
vilaAfter searching for the tar format and looking at the tar sources, it appears that some long file names triggers additional blocks containing the *current* date and time (sic), so false alert, I just learned that you can't compare two tar files :-/01:25
vilafullermd: hehe, did you know about tar wart above ?01:26
fullermdNot specifically what it was, but I did know that two tars of the same source aren't necessarily equal, even if they are equivalent.01:27
vilafullermd: what a shame... apparently this is triggered by block checksums being different (so far so good), the blocks in question are special blocks preceding file header blocks for long file names01:29
vilathese blocks contain a mtime field, which is useless for them so they put 001:29
vila... and somwhow this 0 is converted to current date... boom01:30
vilafullermd: and the 'file change while we read it' rings a bell ?01:30
vilaI triggered it by asking OSX the size of the folder I was tar'ing, silly me, lost a couple more minutes for that :-/01:31
vilathe hard part was confirming that, indeed, OLDGNU_FORMAT (described in tar.h as 'obsolete RSN') was still the current format on OSX (and surely elsewhere) and that, yes, it includes an 'atime' field01:33
vilaNever figured tar knew about that....01:33
vilalifeless: http://paste.ubuntu-nl.org/38244/ contains the .kndx files identified, thanks for confirming that deleting the lines (last of each file) will fix my repo (to the best of your knowledge :)01:42
=== rml [n=Skippy@78.32.35.169] has joined #bzr
vilalifeless: I'm ready to loose the two branches involved, osx.pass.test.suite and bzr.integration01:44
=== tuXXX [n=damien@ARennes-258-1-127-138.w90-25.abo.wanadoo.fr] has joined #bzr
=== CardinalFang [n=c@217.194.71.122] has joined #bzr
=== GaryvdM [n=chatzill@mtngprs5.mtn.co.za] has joined #bzr
tuXXXWhen I bzr push on a sftp, files and directory aren't created, only .bzr, it this the correct behaviour?02:32
PengtuXXX: Yes.02:32
PengtuXXX: .bzr is all that's necessary to run bzr branch on it.02:33
tuXXXThen I need a web front-end to display those files on my web server02:33
PengtuXXX: You can run "bzr checkout", then run "bzr update" in a cronjob or something.02:33
PengtuXXX: Or using bzr+ssh might do it, I dunno.02:34
PengtuXXX: Loggerhead is an advanced web front-end. I dunno about anything simple. There's bzr-webserve, but I'm not sure if it's maintained.02:34
=== Peng wanders off.
tuXXXsftp is useful because it doesn't need bzr to be installed on the server02:35
PengYeah.02:35
=== Gwaihir [n=Gwaihir@ubuntu/member/gwaihir] has joined #bzr
GaryvdMtuXXX - There is a plugin that does that. I'm just going to find it...02:39
GaryvdMThere is https://launchpad.net/bzr-push-and-update/02:41
tuXXXok02:42
tuXXXbzr still needs to be installed server-side02:43
GaryvdMYhea :-(02:43
=== lapthrick [n=mathrick@users.kollegienet.dk] has joined #bzr
=== xOjka [n=wyller@141.80-202-66.nextgentel.com] has joined #bzr
=== duckx [n=Duck@tox.dyndns.org] has joined #bzr
=== duckx [n=Duck@tox.dyndns.org] has joined #bzr
tuXXXok so I have to do a "bzr checkout ." on the server03:04
tuXXXand it's work03:04
tuXXX*and it works03:04
lapthrickhrmm03:26
lapthrickso Gutsy's bzr can't cope with https://03:26
vilalapthrick: what do you mean ?03:28
lapthrickvila: https://bugs.launchpad.net/bzr/+bug/14110503:28
ubotuLaunchpad bug 141105 in bzr "Crash with authenticated https checkout" [Undecided,New] 03:28
lapthrickfirst I thought it was bzr-svn that was failing, but it turns out to die for plain bzr https:// uris as well03:29
vilahow so ? Can you try with https+urllib:// too ?03:29
lapthricksure03:30
AnMastergutsy? what is that03:30
lapthricknewest ubuntu, not released yet03:30
AnMasterah03:30
AnMaster<-- Gentoo user03:31
AnMasterand FreeBSD03:31
lapthrickvila: works with urllib, yeah03:31
lapthrickI actually suspected it might be libcurl-gnutls's fault03:32
vilaI should definitely look at that new version, that error code 77 may indicate some API break somewhere03:33
lapthrickah, of course, you commented on that bug :)03:33
vilalapthrick: you're using a stock gutsy is it ?03:34
lapthrickaye03:34
vilalapthrick: yeah, didn't recognize you as mathrick either :)03:34
lapthrick:)03:34
lapthrickI need to setup an irc proxy03:35
vilalapthrick: if urllib is fine with you, keep using it, be aware that it makes *no* certificate verification though, track bug #82086 if you want to be kept informed on progress03:36
ubotuLaunchpad bug 82086 in bzr "pycurl transport causes tracebacks if the server's SSL cert cannot be verified." [Medium,Confirmed]  https://launchpad.net/bugs/8208603:36
lapthrickvila: I see. That's strange though, as the original svn repo from that bug I have authenticated permanently with plain svn client03:38
=== lapthrick guesses "multiparent" plugin is not intended for end-user consumption yet
vilanothing strange in that :) svn should do proper certificate verification :)03:40
lapthrickgiven the exceedingly brief help it has03:40
james_wlapthrick: I think if you use svn+https:// for bzr-svn on that repo you will havee more success.03:40
lapthrickvila: but isn't it supposed to re-use svn cache?03:40
lapthrickjames_w: yes, I needed a newer bzr-svn though03:40
lapthrickI just got it, lesse if it works now03:40
vilalapthrick: 1) I don't know what bzr-svn does, 2) we are not talking about credentials, we are talking about certificates03:41
vilathe server send a client saying: That's who I am (my certificate), this certificate have been validated by vendor$$$03:42
lapthrickvila: yes, using svn client I accepted that certificate permanently03:42
vilaOk, so it means bzr-svn doesn't use that03:42
james_wI think jelmer says that bzr-svn works fine, it is just that bzr is probing for a bzr branch first, and so fails, adding svn+ bypasses this and goes straight to using the svn client, and so uses the stored information.03:43
lapthrickah03:44
lapthrickjames_w: that makes sense03:44
vilaah03:44
lapthrickmathrick@hatsumi:/tmp$ bzr cl svn+https://beta.aimido.de/svn/src2/trunk03:44
lapthrickSegmentation fault (core dumped)03:44
lapthrick:(03:44
lapthrickit fetches the revisions info properly03:45
lapthrickthen dies03:45
lapthrickcl == checkout --lightweight03:45
james_wlapthrick: you should report that against bzr-svn, jelmer will want to know.03:45
james_wa backtrace might be appreciated.03:45
lapthrickmhm, if I can get a sensible trace03:46
james_wI believe there are python debug packages, and maybe libsvn ones as well.03:47
lapthrickyeah, I'll just check if it happens with branch as well03:47
lapthrickseems to work just fine with branch03:59
=== fog [n=fog@debian/developer/fog] has joined #bzr
lapthrickhmm, isn't bzr status in an svn checkout supposed to work?04:10
lapthrickit doesn't for me04:10
james_wyeah it should I think.04:11
lapthrickoh wait, wrong dir04:11
lapthrickI forgot trunk/04:11
abentleyIf you're getting a segfault, you should try running it under gdb.  That's a bug on the C side.04:12
lapthrickabentley: I know :)04:12
=== CardinalFang [n=c@217.194.71.122] has joined #bzr
lapthrickh, what was the command to see the difference between branches?04:28
datoin terms of revisions, `bzr missing`04:30
dato(for diff, obviously `bzr diff`)04:30
lapthrickyeah, I just saw missing04:33
lapthrickthanks though04:33
=== jelmer_ [n=jelmer@h66-201-205-140.gtconnect.net] has joined #bzr
=== jelmer is now known as jelmer_
lapthrickhey jelmer_04:47
jelmer_hi lapthrick04:48
=== asabil [n=asabil@ti0035a340-0469.bb.online.no] has joined #bzr
lapthrickjelmer_: seen my latest bugreport?04:50
lapthrickI don't seem to be able to get a sensible trace, btw04:51
jelmer_yep04:51
lapthrickis python-dbg `which bzr` ... the correct way to get a backtrace from bzr?04:51
jelmer_`bzr co --lightweight`is just an alias for 'svn co ...' btw04:52
lapthrickjelmer_: oh04:52
lapthrickmathrick@hatsumi:/tmp$ svn co svn+https://beta.aimido.de/svn/src2/trunk04:53
lapthricksvn: Undefined tunnel scheme 'https'04:53
jelmer_without the svn+ :-)04:53
jelmer_ah, that's the problem04:53
lapthrickjelmer_: hmm? So the svn client underneath dies and it crashes because of that?04:54
GaryvdMbzr gdiff04:54
GaryvdMerr wrong window04:54
jelmer_lapthrick: Yes, that's what I suspect04:54
jelmer_GaryvdM: :-)04:54
=== lapthrick runs bzr shell
lapthrickit's noticeably faster04:54
GaryvdMlapthrick: I gave up trying to set it up on windows04:55
jelmer_lapthrick, can you try running that checkout command in gdb?04:55
lapthrickjelmer_: and bzr-svn is , especially now I got it to check out my work repo04:55
lapthrickjelmer_: I guess so04:55
lapthrickjelmer_: ah, yes, that's much more sensible04:57
=== pmezard [n=pmezard@nor75-4-81-56-59-92.fbx.proxad.net] has joined #bzr
lapthrick0x080a215c in PyString_FromFormatV (04:57
lapthrick    format=0x816de98 "'%.50s' object has no attribute '%.400s'",04:57
lapthrick    vargs=0xbfb19f38 "\001") at ../Objects/stringobject.c:20204:57
lapthrick202     ../Objects/stringobject.c: No such file or directory.04:57
lapthrick        in ../Objects/stringobject.c04:57
lapthrickjelmer_: http://pastebin.com/m3301864604:59
jelmer_thanks05:00
jelmer_looks like another python-subversion bug05:01
lapthrickI see05:01
lapthrickjelmer_: why is there a difference between what schemes svn and bzr-svn handle anyway?05:01
=== Qhestion [n=Linrev@Z7bb5.z.pppool.de] has joined #bzr
jelmer_lapthrick: bzr-svn supports everything that svn supports05:03
jelmer_lapthrick: and it also supports 'svn+https' to work around that problem with SSL certificates05:03
lapthrickjelmer_: yeah, but it was bailing out with the same error earlier, before I upgraded to 0.4.305:03
Qhestionhi. can i put my bzr installation (from the windows installer) on my usb stick?05:04
lapthrickand isn't svn supposed to understand svn+https://? It's not uncommon to see urls like that on the net05:04
jelmer_lapthrick: it supports svn+ssh://, svn://, http:// and https://05:04
jelmer_lapthrick: which error did it bail out with earlier as well?05:05
jelmer_Qhestion: you mean the files that it installed or the setup file?05:05
lapthrick"Undefined tunnel scheme 'https'"05:05
Qhestionthe files it installed05:06
Qhestioni just dont want to run the installer on the target machine05:06
Qhestion(read: can't)05:06
jelmer_Qhestion: should work ok as long as all the dependencies are installed05:07
Qhestiondependencies?05:07
GaryvdMQhestion: I've never tried it, but I can't see why not.05:07
jelmer_Qhestion: python, paramiko if you would like to use sftp, etc05:07
Qhestionthis is the "standalone installer"05:07
Qhestionthere shouldnt be dependencies05:07
Qhestionand no sftp needed, only local (usb stick) repos05:08
jelmer_Qhestion, not sure in that case, I don't know where that installs its python binary05:08
GaryvdMMost of the dependencies are built into the installer, except the ssh stuff05:08
Qhestionwell, in C:\Programs\Bazaar there is a Python25.dll05:08
Qhestionguess that is python ;)05:08
jelmer_lapthrick: bzr-svn has to strip the svn+ bit for svn+http and svn+https before it passes urls to the svn libraries05:08
jelmer_there was a bug where that wasn't happening in bzr-svn 0.4.1 I believe05:09
lapthrickah05:09
lapthrickjelmer_: I thought svn+whatever was a general syntax05:09
GaryvdMQhestion: I'm sure it will work - give it a go05:09
Qhestioni only have one try05:10
Qhestion;)05:10
lapthrickQhestion: can't you ask a random friend if you can test if it works?05:11
lapthrickmost probably they won't have bzr installed, so it's a good way to find out05:11
Qhestionlapthrick: all my friends already got python ;)05:12
Qhestionand bzr05:12
Qhestionya know, i need some people to test my software ;)05:12
Qhestioni stopped programming in python, but i use Bazaar as version control system, and also to publish my sources05:13
Qhestionhmm, i remember i should go back to the bazaar bugtracker05:13
Qhestionfiled a feature request there05:13
GaryvdMQhestion: I can do a test on my sisters machine when she gets home - probably in about 15 min.05:13
Qhestionk05:13
Qhestionthank you05:14
Qhestionshall i send you a zip ?05:14
GaryvdMok05:14
GaryvdMgaryvdm@gmail.com05:14
Qhestionwoo 11 MB05:16
Qhestionthis will ake a bit05:16
jelmer_lapthrick: you can add custom tunnel mechanisms to svn for the native svn protocol05:16
jelmer_the http protocol is different though05:16
jelmer_lapthrick, Thanks for the backtrace, I have to head out now, will have a look at it later today.05:16
GaryvdMdon't worry - I'll download the installer05:16
Qhestionok05:16
=== jelmer_ is now known as jelmer
=== asak [n=alexis@201-1-42-33.dsl.telesp.net.br] has joined #bzr
GaryvdMQhestion: It works05:44
GaryvdMAnd my sister dose not have admin rights on her machine05:45
GaryvdMs/dose/does05:45
=== schierbeck [n=daniel@dasch.egmont-kol.dk] has joined #bzr
QhestionGaryvd: thank you05:46
QhestionGaryvd: she does not have admin on her own machine? lol. good job ;)05:47
GaryvdMIt's a work machine from a big corporate...05:48
Qhestionoh05:48
schierbeckphanatic: hey05:50
phanaticschierbeck: hi :)05:50
schierbeckphanatic: i was thinking05:50
schierbeckdo you really need a date column in the viz treeview?05:51
schierbeckit happens quite often with big projects that the window becomes too wide05:51
phanaticgood question, it's nice to see the date right away, not just in the details. but it often runs off the screen because of the graph being too wide05:52
schierbeckphanatic: but i'd rather have a nice, easy-to-comprehend graph than a timestamp...05:53
schierbecki mean, it's not often you actually *need* to know the exact time of a commit, or do you?05:54
schierbeckit may just be me...05:54
phanaticyeah, you're probably right05:54
schierbecki think i'll create a branch and toy around with it05:55
GaryvdMschierbeck, phanatic: I've hacked up a possible solution to reduce the with of the graph. I was just emailing phanatic about it.05:55
=== michelp [n=michelp@69-30-72-119.dq1sf.easystreet.com] has joined #bzr
GaryvdMs/with/width05:55
phanaticactually i was thinking about redesigning the full thing. e.g. display only the graphs, and the details only when you move your mouse on a node. what do you think?05:55
GaryvdMhttps://code.launchpad.net/~garyvdm/bzr-gtk/brokenlines05:56
schierbeckGaryvdM: cool, as long as the graph is still easy to read05:56
schierbeckphanatic: i like the commit message being there, and sometimes the author05:56
schierbeckbut there's no need for both the author name and email05:56
GaryvdMThats a good point...05:57
phanaticindeed05:57
=== Qhestion [n=Linrev@Z7bb5.z.pppool.de] has left #bzr []
schierbeckGaryvdM: i'm not sure about the new graphs, i took a look, and it's a bit curvy (?)06:03
schierbeckof course, i'm no authority on the subject06:03
phanaticGaryvdM: this brokenlines stuff is pretty interesing06:03
phanaticschierbeck: imho they look better this way06:03
schierbeckphanatic: okay, it seems i'm outnumbered in my favor of straightness :P06:05
phanatic:D06:05
schierbecki really like the way broken lines are handled06:05
schierbeckin the new branch, that is06:05
phanaticyep, me too06:06
phanaticdoes it load faster as well, or it's just me who feels it? :)06:06
GaryvdMI hope so :-)06:08
GaryvdMI should only be loading the revision data after the first screen is shown06:09
GaryvdMI'm hoping I can get it to only load the revision data for a rivision when it is scrolled into view.06:10
GaryvdMs/I/It06:11
phanatic2.625s on bzr.dev, that's quite impressive06:11
schierbeckGaryvdM: do you think you could get the merge and branch-off lines to join at a different angle?06:11
GaryvdMYes - play with the curve controll points06:12
schierbeckphanatic: i've made a version of viz without the date column, have a look: https://code.launchpad.net/~dasch/bzr-gtk/viz-remove-timestamp-column06:13
schierbeckGaryvdM: ok, i'll look into it06:13
phanatichuh, with current bzr-gtk trunk it takes 25.085s06:13
GaryvdMviv/graphcell.py line 181-18706:13
phanaticoops, 15.085s that is :)06:13
phanaticbut still 7 times more than with brokenlines06:13
ubotuNew bug: #144071 in bzr "dirstate-tags format is expensive for network operations?" [Undecided,New]  https://launchpad.net/bugs/14407106:16
phanaticschierbeck: thanks, i will :)06:16
schierbeckphanatic: i'm also looking into cutting off the email portion of the committer id06:16
phanaticgreat06:16
phanaticGaryvdM: what do you think: is brokenlines stable enough to get in into 0.91?06:17
GaryvdMI don't know - I would love to have testing done on it.06:18
GaryvdMLots of new code.06:18
GaryvdMs/more testing06:19
phanaticfine, i won't merge it then before the release :)06:20
GaryvdMYhea - lets merge it just after the release.06:20
schierbeckphanatic: the new version should have been pushed to lp now, got a little ahead of myself before06:21
schierbecki also tried making the graph column non-resizable06:21
schierbecki think it is actually better -- when do you *not* want to see the branch graph?06:21
phanaticschierbeck: if it gets too wide, maybe?06:24
schierbeckphanatic: perhaps, but i think the graph is the main feature of the viz -- without it, it's really hard to navigate06:25
phanaticyes, you're right06:25
schierbecki think it's better to make sure the graph will almost never be too wide06:25
schierbeck:)06:25
phanaticthat's where brokenlines comes into the scene ;)06:26
schierbeckphanatic: i've pushed the changes to lp; the email part is now hidden in the treeview06:31
schierbeckmy implementation is not perfect; i guess the separation of name and email should go in bzrlib, not in bzr-gtk06:32
phanatici get a traceback here06:33
phanaticTraceback (most recent call last):06:33
phanatic  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/gtk/viz/branchwin.py", line 190, in populate_model06:33
phanatic    committer = revision.committer.split('<')[0] .strip()06:33
phanaticAttributeError: 'NoneType' object has no attribute 'split'06:33
phanatic(i ran bzr viz on bzr.dev tree)06:35
=== mneptok [n=mneptok@canonical/support/mneptok] has joined #bzr
schierbeckphanatic: ok, committer can apparently be None...06:38
phanaticyeah, it seems :/06:39
schierbeckheh, there was a check for revision.committer is None one line above... doh!06:40
lapthrickso, I have one branch A (which is mine), and now I want to incorporate another branch B (upstream, not mine) as a part of A, but in a way that would still let me merge further changes in A06:40
lapthrickis that possible?06:41
=== sverrej [n=sverrej@cm-84.208.117.164.chello.no] has joined #bzr
lapthrickboth branches are created by bzr-svn btw06:41
lapthrick*further changes in B06:41
schierbeckphanatic: pushed a fix06:42
phanaticwow, lp syncs pretty fast finally06:42
schierbeckyup06:43
phanaticschierbeck: looks fine to me :)06:44
schierbeckphanatic: can it get merged into trunk, or is it too big a change of the ui?06:44
phanatici think it's sane change. and we don't have things like ui freeze :)06:45
schierbecklovely :)06:46
phanaticschierbeck: you know the drill: add a NEWS entry, and i'll be all happy :P06:46
schierbeckgreat06:46
Odd_Blokelapthrick: Are you asking if you can incorporate branch B into branch A but later be able to merge further changes from B into A?06:49
Odd_Blokelapthrick: If so, is branch A related to branch B at all?06:49
schierbeckphanatic: added NEWS entry and pushed to lp06:49
lapthrickOdd_Bloke: no, not at all related. I want to incorporate it as in I want all the files from B in A (in a subdirectory, too)06:50
GaryvdMDo you want the rivision history from B in A?06:52
GaryvdMIf not, you can just use a nested directory06:53
GaryvdMIf yes - I think you need to use graft?06:55
lapthrickGaryvdM: no, I don't really need the history of B past the point it got imported into A06:55
GaryvdMhttp://spacepants.org/src/bzrgraft/06:55
lapthrickGaryvdM: so I just copy it and that's all? What happens if at one point I decide to move a file outside B? Also, will A see B as a part of it (as in, I will commit and it will notice all those files that appeared)?06:56
GaryvdMAre you talking about a nested branch?06:57
lapthrickI think graft is not compatible with recent bzr's06:57
lapthrickGaryvdM: I guess I am06:57
lapthrickif I use a nested branch, will the branches understand their mutual relationship?06:58
GaryvdMFor a nested branch - you have two seperate branches with seperate rivision histories, but one is inside the other on the file system06:58
GaryvdMOnce you have imported B into A, will you need to merge changes from B's trunk into B06:59
lapthrickGaryvdM: but I need them integrated. Basically I have a big repo A, and I have some outside vendor's source B I want to import. So I want A to contain all the files from B, but I want them also to retain their identity, so that when the vendor commits changes to their repo, I can just pull them and it'd do the right thing07:02
lapthrickyet I also need to be able to manipulate the imported files myself, as the B sources are not usable for me pristine07:03
GaryvdMI think a nested branches would be the best solution, but not perfect. Lets say you make a change to A and a change to B that go together, you would have commit seperatly to A and B.07:06
GaryvdMBut it would be easy to merge you changes to B with the vendors changes.07:07
lapthrickGaryvdM: okay, so when someone branches off A, will they also get a copy of B?07:08
GaryvdMno07:08
lapthrickso that's not really a solution for me, I need A to actually have all of B in it07:09
lapthrickso basically I need 'bzr steal' functionality07:17
=== GaryvdM_ [n=chatzill@mtngprs5.mtn.co.za] has joined #bzr
lapthrickGaryvdM_: how hard would it be to add such 'bzr steal' function?07:18
lapthrickhmm, I wonder if multiparent does anything of what I want07:19
=== GaryvdM_ is now known as GaryvdM
GaryvdMlapthrick: I don't know - I have only been hacking on bzr-gtk for about a month.07:20
lapthrickI see07:21
schierbeckGaryvdM: do you think revision id deserves its own column in the viz window? i tend to prefer a tooltip instead07:21
=== lapthrick pokes people he suspects have a clue, like lifeless, abentley and james_w
GaryvdMNo - it's very long07:22
lapthrickhttps://launchpad.net/bzr-merge-into/07:22
lapthrickoho!07:22
GaryvdMI supect that you are talking about the revision number column though07:22
schierbeckGaryvdM: sorry, i meant revision number07:23
GaryvdMWell  - Someone loged it as a feature request: https://bugs.launchpad.net/bzr-gtk/+bug/6416707:24
ubotuLaunchpad bug 64167 in bzr-gtk "bzr viz don't show revno for main revisions" [Wishlist,Fix committed] 07:24
schierbeckhmm, it says "fix committed" -- where's the fix?07:25
schierbeck(using trunk)07:25
GaryvdMViz is being used for 2 things - a GUI for Log - and a graph renderer07:25
GaryvdMI't commited to https://code.launchpad.net/~garyvdm/bzr-gtk/vizchanges, but not to trunk yet07:26
schierbeckGaryvdM: ok07:26
schierbeckas a column or a tooltip?07:26
GaryvdMMay be we need a interface to select what columns the user wants07:27
phanaticGaryvdM: btw we assume that "Fix committed" means it was committed to trunk (just a sidenote)07:27
GaryvdMOh07:27
GaryvdMChanged07:28
abadger1999abentley: around?07:32
lapthrickdoes John Arbash Meinel IRC? And if so, what nick does he use?07:55
phanaticlapthrick: jam07:56
lapthrickdoesn't really seem to be here07:57
phanaticlapthrick: 1. it's weekend 2. he's on us time07:57
lapthricktrue07:57
=== sverrej [n=sverrej@cm-84.208.117.164.chello.no] has joined #bzr
=== sverrej [n=sverrej@cm-84.208.117.164.chello.no] has joined #bzr
james_w3. he's got a new son.08:32
james_wlapthrick: I can't spot your question, would you mind repeating it?08:32
lapthrickjames_w: yes, I basically want to do what merge-into provides: merge in outside code into my own branch, whilst still retaining the ability to pull in later changes in upstream08:33
lapthrickat least if I understand merge-into's scope correctly it's supposed to do that08:34
james_wand merge-into isn't what you want?08:35
lapthrickjames_w: it is, but doesn't work08:35
lapthrickhttps://bugs.launchpad.net/bzr-merge-into/+bug/14410808:36
lapthrickjust finished writing08:36
ubotuLaunchpad bug 144108 in bzr-merge-into "Doesn't work with 0.90 --  no attribute 'base_is_other_ancestor'" [Undecided,New] 08:36
lapthrickif I can get this fixed, I no longer will have to put up with stupid subversion crap08:37
james_wlapthrick: thanks, caught up now.08:38
james_wso, I believe merge into is now superceded by by-value nested trees, so I think that should solve your problem.08:39
james_whowever I don't really know how they work, and they are still experimental.08:39
james_wand by-reference nested trees are currently completely broken, so maybe by-value are too.08:40
lapthrickouch, I don't really understand what you just said08:41
james_wdo you understand nested trees?08:41
james_was in you have one tree (branch) tracked as part of another.08:42
lapthrickjames_w: yes, the concept is pretty clear and incidentally exactly what I want (as long as I am still able to move parts of the inner tree to the outside one)08:44
james_wyeah, it sounds like you want a by-value nested tree.08:45
lapthrickwhat's the difference?08:45
james_wby-value means that the contents are tracked, by-reference means that just a pointer is tracked.08:45
lapthrickI see08:45
lapthrickso yeah, by-value08:45
james_wby-value is just breaking up a branch so that you can branch from a sub-directory of it.08:46
ubotuNew bug: #144108 in bzr-merge-into "Doesn't work with 0.90 --  no attribute 'base_is_other_ancestor'" [Undecided,New]  https://launchpad.net/bugs/14410808:46
james_wbut also allows you to merge as you want I hope.08:46
james_wmerge-into was jam's plugin to do by-value before nested trees were started.08:46
lapthrickjames_w: excellent, bzr + bzr-svn == all bzr , no stupid svn 08:47
lapthrickas long as it works, that is :)08:47
james_wyeah, you shouldn't have to touch svn08:48
james_wlapthrick: I have an idea for fixing merge-into, wnat to try it?08:51
james_wedit merge_into.py, and on the line (near the end) before conflicts = merger.do_merge() insert merger.find_base()08:52
lapthrickjames_w: sure08:52
james_wthat should set the missing attribute, but whether it will work is another question.08:53
lapthrickokay, lemme try08:53
=== Lo-lan-do [n=roland@mirexpress.internal.placard.fr.eu.org] has joined #bzr
lapthrick"Branches have no common ancestor, and no merge base revision was specified."08:55
lapthrickjames_w: success was not full it seems08:56
james_windeed.08:56
james_wperhaps try in __init__ just set self.base_is_other_ancestor = False and remove the other change.08:57
james_wI'm not sure what the effect will be, but it sounds like that will never be true in this case.08:57
lapthrickyeah08:57
james_wor I have another suggestion.08:59
james_wwhere you put find_base before put set_base_revision09:00
=== luks [n=luks@89-24-5-83.4ginternet.cz] has joined #bzr
james_wmerger.set_base_revision(revision.NULL_REVISION, branch_to_merge)09:02
james_wyou will need to do from bzrlib import revision before09:02
james_wafter that I'm a bit stuck for ideas.09:03
=== matkor [n=matkor@ip83-230-19-175.e-zabrze.pl] has joined #bzr
=== sverrej [n=sverrej@cm-84.208.117.164.chello.no] has joined #bzr
=== g0ph3r [n=g0ph3r@p57A0B702.dip0.t-ipconnect.de] has joined #bzr
lapthrickjames_w: okay, lemme try that09:26
lapthrickjames_w: are those two separate ideas, or a single change?09:26
james_wtwo separate, I would try the second one first, it seems like less of a hacky change.09:27
james_weven if it is unlikely to work/09:27
lapthrick<james_w> merger.set_base_revision(revision.NULL_REVISION, branch_to_merge)09:27
lapthrickthis one, set in place where I previously did find_base?09:27
james_wyes.09:27
james_wadding the import statment just above.09:28
lapthrickshould I also add find_base call?09:28
james_wor add revision to the list of imports at the top.09:28
james_wno, the find base is the wrong one, it should be deleted, as I see it will never work here.09:28
lapthrickokay09:28
lapthrickjames_w: awesome, that worked09:33
lapthrickI will post a patch for that bug then09:33
james_wwow.09:33
james_wdid you try it on your branches as well?09:33
lapthrickjames_w: yes, bzr missing --other ../other shows nothing09:33
lapthrickwhich is exactly what I expected :)09:34
james_whorsesome.09:34
lapthrickI'm gonna try pulling some changes from upstream now09:34
lapthrickhmm09:36
lapthrickjames_w: http://pastebin.com/m1a097d9d09:36
james_wlapthrick: so is that file named foo.html or pokersource/foo.html in ../../pokersource?09:38
lapthrickjames_w: foo.html, if I wanted to access it, I'd say ../../pokersource/foo.html09:39
james_wand when you did the merge-into you made it put the contents of the ../../pokersource branch in pokersource/ ?09:40
lapthrickjames_w: yes09:41
james_wthat's a good sign I think then.09:41
lapthrickhow so?09:41
james_wit knows how to resolve that file in to the subdir.09:41
lapthrickdo you mean it can be fixed, or that it's not broken?09:41
james_wso I think a path conflict comes when you add a file of the same name in two branches independently09:42
james_wwhich would suggest that the merge-into messed up the file-ids.09:42
james_wbut the fact that it knows that ../.../foo.html corresponds to pokersource/foo.html means that it got something right.09:43
lapthrickah09:43
james_wlapthrick: it's definately broken, I was just commenting that it seemed to be at least partially right.09:43
lapthrickjames_w: can I get it to tell me file-ids?09:43
james_wIt may be fixable.09:43
james_wlapthrick: I'm not sure about command line. I can do it with bzrlib easily if you want to.09:44
james_wpython09:44
james_w>>> import bzrlib09:44
james_w>>> from bzrlib.workingtree import WorkingTree09:44
james_w>>> t = WorkingTree.open_containing('.')09:44
james_w>>> t.path2id(path)09:45
james_whowever I'm not sure which id you will get it the conflicting case.09:45
james_wif you revert, and then check pokersource/foo.html in this branch, and then foo.html in the other they should be the same.09:46
lapthrick>>> t.path2id("pokersource/foo.html")09:46
lapthrickTraceback (most recent call last):09:46
lapthrick  File "<stdin>", line 1, in <module>09:46
lapthrickAttributeError: 'tuple' object has no attribute 'path2id'09:46
james_wt = t[0] 09:46
james_wI always forget that one.09:46
lapthrickjames_w: and how do I retrieve the id now? It didn't return any value09:47
james_wI'm also not sure whether it's the fact that you are doing a delete that is causing the issue.09:47
james_w>>> t.path2id should work now.09:47
lapthrickyes, but it doesn't return anything09:47
lapthrickwell, returns None09:47
james_wthat means the file is not versioned.09:48
james_wdid you revert first?09:48
lapthrickno09:48
james_wtry the reverted case first, and also uncommit + revert in the other branch to test that one.09:48
james_wlet's check that it thinks the two files are the same first, then work out what causes the conflict.09:49
=== sverrej [n=sverrej@cm-84.208.117.164.chello.no] has joined #bzr
lapthrick>>> t.path2id("pokersource/foo.html")09:50
lapthrick'foo.html-20070922173216-lw0yu2ouatfdvc2r-1'09:50
lapthrick>>> t.path2id("foo.html")09:50
lapthrick'foo.html-20070922173216-lw0yu2ouatfdvc2r-1'09:50
lapthrickso they got the same ID09:50
james_wthat's good. bzr will equate the two.09:52
lapthrickjames_w: indeed, non-rm change works just fine09:52
james_wyou may get the conflict as you are doing a delete. Can you instead try an edit in the upstream branch and then merge that.09:52
james_wah, that's good then.09:53
lapthrickyeah, I just did :)09:53
james_wI wonder where that conflict comes from then.09:53
james_wyou could look at the conflicts documentation.09:53
lapthrickwhat do you mean?09:53
james_whttp://pastebin.com/d4818a9e709:55
james_wthere is a conflicts section of the user guide.09:55
james_wI guess this is the parent directory case.09:56
james_wso bzr sees 'rm foo' in one branch and 'mv foo ...' in the other and doesn't know who to listen to.09:57
james_wlapthrick: it appears to be working, so you could resolve the conflicts as a workaround, and then ask on Monday for any ideas for a fix.09:58
lapthrickjames_w: hmm, but why does it see mv?09:58
lapthrickjames_w: yep, it's already much much awesomely better than trying to do the same with subversion :)09:59
lapthrickI love how bzr is the best available svn client09:59
james_wwell, one tree has / as the parent, the other has /pokersource/ and so it considers it a move I guess.09:59
lapthrickjames_w: oh, I see. So we need to muck the path in there to make it see pokersource/ as the parent where needed10:00
lapthrickas / I mean10:00
james_wbzr doesn't actually record moves, it just preserves file ids, and then sees name and parent directory changes as moves later I believe.10:01
lapthrickjames_w: in any case, huge thanks for the help10:01
james_wlapthrick: no problem. This fix is probably a bit in depth for me.10:01
lapthrickmaybe jam will come around on monday10:02
lapthrickright now I have it working, I don't need to pull in any actual change yet, so it's really not a big issue10:02
james_wthat would be one fix, but I'm not sure that you could enforce that without massive changes (aka nested trees I guess).10:02
lapthrickyeah10:02
james_wand the conflicts should be easy to solve, and perhaps rare.10:02
lapthrickotherwise it'd try to move to /.., and that just doesn't make sense10:03
james_wI guess the nested tree support there is may provide a way to fix this.10:03
lapthrickyeah, I'm more than happy to move to that once it's not broken10:03
james_wI guess jam maybe knew this was a limitation, but it was 'good enough'.10:03
james_wit needs someone to pick it up, and most of the core devs are on performance at the moment.10:04
james_wlapthrick: could you mail a bundle to the bug report with your fix please?10:04
james_wI'm off out now, so I can't commit it tonight, but if it's in my inbox it will remind me to do it tomorrow.10:06
lapthrickjames_w: sure10:06
james_wthanks.10:06
=== juliank [n=juliank@f048034228.adsl.alicedsl.de] has joined #bzr
=== GaryvdM_ [n=chatzill@mtngprs4.mtn.co.za] has joined #bzr
=== GaryvdM_ is now known as GaryvdM
=== dewd [n=dewd@201.9.147.182] has joined #bzr
=== sverrej [n=sverrej@tul-1x-dhcp017.studby.uio.no] has joined #bzr
=== jrydberg [n=Johan@c80-216-246-123.bredband.comhem.se] has joined #bzr
=== BasicOSX [n=BasicOSX@216.70.10.130] has joined #bzr
=== cprov [n=cprov@canonical/launchpad/cprov] has joined #bzr

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