/srv/irclogs.ubuntu.com/2009/12/10/#bzr.txt

xnoxCan someone give me a scenario when you want to use :parent :push :submit and :public branches00:04
xnoxspiv: yeap everything gets preserved you can be bound and have :parent :push :submit and :public00:08
johnjosephbachiranyone here have any experience with add --file-ids-from ... ?00:25
johnjosephbachirit seems tantalizingly useful but i cannot find any examples00:26
james_wjohnjosephbachir: you pass a path to another branch and if the path it is adding is in the other branch then it re-uses the file-id from that in this branch00:27
james_wsay you have a stable and a development branch00:27
james_wyou want to add COPYING to each00:27
james_wyou go in to stable and "bzr add COPYING", commit etc.00:27
james_wthen go to development, put the file there, and then "bzr add COPYING --file-ids-from ../stable"00:28
james_wand then when you merge there won't be a path conflict due to two random id assignments being done00:28
james_wthat's not the only use, and there are other ways to achieve the same thing in that case, but it's an example00:29
johnjosephbachircool00:29
johnjosephbachiri am interested in the last line of the paragraph in the manpage: It is also useful when merging another project into a subdirectory of this one00:29
johnjosephbachirjames_w: i imagine that this should be useful in subsequently updating the files in the subdirectory project00:30
johnjosephbachirbut i can't fathom what that workflow would be00:30
johnjosephbachirsince there is no notion of running a merge on a subtree which points to a foreign branch (is there?)00:31
james_wwell, if the ids match then it will merge the files00:33
james_whowever, I'm not really sure how that would work00:33
james_was you have to get the revision history joined as well (could perhaps just be a second step)00:33
james_wand I don't know how you deal with the root, or the path differences00:34
james_wthere's a merge-into plugin for doing this task, probably better to look at that if you are actually looking to do this00:34
johnjosephbachirjames_w: great, i will definitely check that out. was also looking at bzr-scmproj but it seemed a little heavy00:35
johnjosephbachirit doesn't work with 2a repos... great.00:42
james_wwhat doesn't?00:55
poolieigc, random idea for the plugin guide, since it came up with jml01:07
pooliedocument how to handle heavy dependencies01:07
pooliedon't load them from __init__01:07
pooliejust let the commands fail01:07
pooliehello james_w01:07
igcpoolie: interesting01:07
james_whi poolie01:07
james_wmorning igc01:07
igcpoolie: bialix made some changes to the command handling is explorer lately to reduce start-up time, etc. so it will be nice to capture that sort of wisdom01:08
igcin01:08
james_wpoolie: the couple of threads on udd seem to be stalled01:08
james_wdo we need to jump-start them?01:09
pooliethey do a bit01:09
igchi james_w01:09
pooliewe are working on some bugs01:09
pooliespiv is doing per-file merge hooks today01:09
pooliebut i think we need to get the earlier pipeline stages flowing too01:09
pooliejames_w: any specific things we should do?01:13
pooliejust reply to the loose ends?01:13
der|is there any command to remove the 'pending-deletion' and 'limbo' directories from my .bzr directory ?01:14
pooliehm01:14
pooliedo you need to?01:14
der|many times bzr complains that the files exist and I can't do nothing01:15
pooliei guess you can just delete them but maybe file (or look for) a bug report01:15
james_wmy mail about the things we may need over the next few months hasn't seen many responses01:15
pooliebecause you shouldn't need to manually remove them01:15
der|bzr: ERROR: This tree contains left-over files from a failed operation.01:15
james_wI don't think there's been an assessment of which we need and which we will do01:15
pooliei'll look at them again- but igc, spiv, can you look too please?01:16
der|now, I've heavily used bzr on a linux-based system, but since I (unwillingly) had to migrate to windows, bzr starts creating some sort of lock files and the limbo ones01:16
igcpoolie, james_w: shall do01:16
* spiv looks01:17
der|on linux bzr works flawlessly to my experience01:17
der|poolie, there's already a bug report in this: 42777301:18
pooliebug 42777301:18
ubottuLaunchpad bug 427773 in bzr/2.0 "empty limbo dirs prevents to successful execution of bzr commands and left working tree locked" [Medium,Fix released] https://launchpad.net/bugs/42777301:18
pooliehm01:18
poolieand are you on 2.0.1 or 2.1.0b1 or later?01:18
der|Bazaar (bzr) 2.1.0b301:19
der|poolie, so far I haven't had the annoying lock issues (thank God)01:19
der|seems like that has been fixed01:19
poolieder|: so this bug is apparently not fixed?01:20
der|poolie, btw, if I have to report something regarding the bzr explorer plugin, where should I go ?01:21
poolieand they are empty?01:21
poolieplease comment there and reopen it then01:21
poolielaunchpad.net/bzr-explorer01:21
der|the limbo and pending-deletion are empty correct01:21
der|poolie, maybe this helps:  I was workign with a Photoshop PSD file, and I was trying to revert it with:   bzr revert --no-backup -r5 home.psd, after that the limbo and the pending-deletion directories were conflicting01:22
der|poolie, do the bzr explorer guys have an IRC channel ?01:22
pooliethey're in here -- hi igc!01:31
poolieder|: please reopen the bug and say that there01:32
pooliei'm happy to help you here but i want a record too01:32
pooliewas it maybe still open in ps when you did this?01:32
pooliecould be file locking01:32
der|poolie, sure, I'm filing a bug for bzr explorer now, just 1 sec01:32
der|poolie, yeah, ps was open, maybe that's the issue01:32
pooliei'm surprised it would fail on the limbo directories rather than when moving the file though01:33
johnjosephbachirjames_w: merge-into doesn't work with 2a01:35
johnjosephbachirit also doesn't help with subsequent merges (i think)01:35
james_wthat sounds odd01:35
johnjosephbachirindeed01:36
der|poolie, how do I reopen the bug ?01:38
poolieclick 'status'01:38
der|it has 2 statuses, one says Bazaar and the other says 2.001:38
der|both say 'Fix Released'01:39
pooliemm01:39
pooliecos it's a bug we'd like to fix in the stable series01:39
der|https://bugs.launchpad.net/bzr/+bug/42777301:39
ubottuUbuntu bug 427773 in bzr/2.0 "empty limbo dirs prevents to successful execution of bzr commands and left working tree locked" [Medium,Fix released]01:39
poolieso in this case it would be reasonable to reopen both01:39
der|indeed01:39
der|so, post the same comment on both statuses ?01:40
pooliejust one comment will do01:40
der|ok good, which status I set ?01:40
poolieboth01:40
poolieyou can change them with no comment01:40
der|ok, but where it says Fix Released, should I put 'In Progress' ?01:41
pooliei'll do it01:42
poolieyou concentrate on the comment :)01:42
der|ok hehe, I'll just put the comment01:43
der|poolie, ok, posted the comment01:47
pooliecan you reproduce it?01:47
der|ok, let me try, 1 sec01:47
der|poolie, if I try to revert 3 times, it first tells me about the pending-deletion, then about the limbo, and then it locks it01:52
der|poolie, ok, I'm able to reproduce it 100% of the time, what should I do now ?01:54
der|poolie, and by the way, bzr actually reverts the file, so that error or exception should not be displayed/thrown01:55
pooliejust post that01:55
pooliemaybe garyvdm can look at it01:55
der|ok, I'll post how to reproduce it01:55
Stavroshello01:58
Stavrosdoes anyone know of a continuous integration server that receives pull requests, pulls, checks the build and merges if the tests pass?01:59
Stavrosi can't remember the name...01:59
lifelessigc: http://blogs.sun.com/joshis/entry/hudson_integration_in_netbeans_6 <- slick :)02:00
der|poolie, just posted the comment with the replication procedure, hope it helps :)02:00
bob2Stavros: PQM?02:01
Stavrosbob2: let me check, i think that's it02:02
Stavrosyes, fantastic, thanks!02:02
der|well, I'm out, thanks for the support guys, and kudos for creating such a wonderful piece of software... peace and good night!02:02
Stavrosdoes anyone know how it compares to hudson?02:02
lifelessStavros: apples and oranges02:02
lifelesshudson does not have test-before-commit yet02:02
lifelesspqm only has test-before-commit02:03
lifelesshudson has a shiny UI and lots of toolchain support02:03
lifelesspqm has bare bones UI - its a 'hackers tool'02:03
Stavrosah, i see02:03
Stavrosdoes it only work by email?02:03
Stavrosbasically as i understand it hudson only tests after the commit while pqm does not commit unless the tests pass02:04
lifelesspqm has a pluggable queue concept but only one impleentation -the email submission, locally stored queue02:04
Stavrosah right right, i see02:04
lifelesshttp://issues.hudson-ci.org/browse/HUDSON-168202:04
lifelessif that ^ gets done, then it would be equivalent to pqm, but much much nicer02:04
pooliejames_w: so i guess just knowing that people should report those failures as bugs on udd helps02:05
Stavrosyeah, but also much harder for them to do it i imagine02:05
Stavrossince they're looking to do it in a general manner02:05
Stavrosi have to decide which method i want to use, then02:05
lifelessStavros: not really, pqm is pretty general02:05
lifelessits just a matter of doing it.02:05
Stavrosdoes it support other scms?02:05
poolieder|: fyi 'incomplete' means 'we need more data to do anything' not 'incompletely fixed'02:05
spivpoolie, james_w: replied to udd list02:06
spivpoolie, james_w: there are some points there that I think need attention from the lp code team rather than the bzr team, though02:06
spive.g. the query about 'Do Branch.requestMirror() and Branch.last_mirror_attempt refer to importing to the code if the branch is a vcs-imports one?'02:07
fungaliciouspoolie: ping02:10
fungaliciousthumper: ayt?  (this is actually kfogel)02:11
thumperfungalicious: nah, you don't sound like him02:12
fungaliciousthumper: :-)02:12
fungaliciousthumper: heh.  At Winnie's house, left my computer elsewhere02:13
fungaliciousthumper: can you do me a favor?  I forgot to send out a message to internal launchpad list, addressed to team leads, saying that we were giving up on the SIP thing and that the next call would use regular conf system02:14
fungaliciousthumper: I can't send it easily from here, as my work email authn creds are not on this box02:14
thumperfungalicious: I'll send one out02:15
fungaliciousthumper: my impersonation worked!  You really believed I am kfogel!  MY CORPORATE ESPIONAGE IS SUCCESSFUL!!!02:16
fungaliciousthumper: thank you02:16
* thumper thinks twice02:16
fungaliciousc'mon, only kfogel would say that02:16
* thumper thinks thrice02:16
thumperheh02:17
* fungalicious goes recursive on the whole impersonation thing02:17
thumpersure, I'll send it out02:17
fungaliciousNow I have to wonder if this is really thumper.02:17
=== thumper is now known as eric-the-viking
fungaliciousHAH02:17
fungaliciousnic02:17
fungaliciousnice02:17
=== fungalicious is now known as eric-the-half-a-
eric-the-half-a-dang02:18
=== eric-the-half-a- is now known as fungalicious
fungaliciousok, signing out as I think spending the night on IRC is perhaps not what Winnie and I had in mind02:19
fungaliciousthumper: thanks02:19
=== eric-the-viking is now known as thumper
pooliewonder what he wanted02:42
lifelesswhom?02:45
gutworth(who you mean?)02:55
=== timchen1a is now known as nasloc__
=== BasicPRO is now known as BasicOSX
* igc lunch04:01
=== fenris__ is now known as ejat
=== retupmoca` is now known as retupmoca
jamlifeless: I did some work on bug 481119, it is pretty annoying as it prevents using hudson + junit with bzr selftest --subunit05:43
ubottuLaunchpad bug 481119 in pyjunitxml "TypeError while running bzr selftest --subunit | subunit2junitxml" [High,Triaged] https://launchpad.net/bugs/48111905:43
jamtz aware datetime is crap05:43
jamIMO05:43
jamnote that *with* my ugly ugly hack, I was able to run a subset of the test suite using hudson on win32 and have it report results05:47
* igc medical appointment05:51
jamigc: good luck05:51
igchi jam - thansk05:51
igcthanks05:52
lifelessjam: oh, cool06:04
lifelessjam: let me have a look at the bug, one sec.06:05
jamis there a reasonable "display a rough summary of what is going on" that would be reasonable to include in the 'build and run the tests' output?06:06
jamI'd like something that I could check to see that it is making progress06:06
jambut I don't really want the full subunit output06:06
lifelessjam: sure, subunit2pyunit06:06
poolienight all06:06
jamso, subunit2pyunit --progress makes sense to be, but not really in a build system06:06
jamnight poolie06:07
jamI guess it just gives pyunit --verbose output, which you're probably right06:07
jamis the most reasonable thing06:07
jamone line per test06:07
jamnow if only pure win32 actually had a 'tee' program... :)06:08
lifelesswe can make subunit2pyunit pass the stream through06:09
lifelessselftest | subunit2junitxml -o tests.xml | subunit2pyunit06:09
lifelessjam: there is a hudson ssh thingy now, for ec2 w/ windows06:10
jamlifeless: well, I have cygwin installed and can just grab that, but it seems stupid06:10
lifelessI've linked it to the ec2 windows bug06:10
jamlifeless: yeah, I saw the ssh thing06:10
jamI don't know about start/stop yet for windows06:10
lifelessjam: win32 shell can pipe can't it ?06:10
jamlifeless: shell can pipe, can't tee06:10
lifelessright06:10
lifelessso would -  selftest | subunit2junitxml -o tests.xml | subunit2pyunit work ?06:11
lifelessif that passed the stream through06:11
jamlifeless: probably06:11
jamI sort of like saving the subunit results, though06:11
jamsince I can use them in debugging06:11
lifelessyes06:11
jamthe hudson progress bar is quite interesting06:11
jamit seems to base it on how long things are expected to take06:12
lifelessyes06:12
jambased on previous runs06:12
jamas mine is now fully in the red06:12
jamas previously I just ran "setup.py build" which is a bit faster than 'selftest' :)06:12
lifelesswhat hudson instance are you using?06:12
jamlocal06:12
lifelesscool06:12
jamEventually, I'd like to hook it up to ec206:12
jamand then see about stuff with babune06:12
jambut figured one step at a time06:12
lifelessso, parameterised jobs will let you submit arbitrary branches06:12
lifelessnight poolie06:13
lifelessthe drizzle folk do this06:13
jamyeah, though there is also a Bazaar plugin06:13
jamthat can check out code from bzr automatically06:13
lifelessthey have a parameter trigger in fact - one field, put in a branch, and it kicks off 8 different configs06:13
jamwhich I'm also playing with06:13
lifelessjam: this is with that plugin.06:13
lifelessthe two combine for more awesome06:13
jamhmm.. I haven't seen a way to use the parameter from the parameterization in the plugin06:13
jamI've seen the fields you can add06:13
jambut I would have to write the 'bzr branch' manually (from what I've seen so far)06:14
lifelesslet me poke at their config06:14
lifelessyou have a parameter BZR_BRANCH06:14
lifelessand in the SCM details you say06:15
lifeless${BZR_BRANCH} as the bazaar repository URL06:15
jamSo in the "configure this build" page, I have a "Repository URL" in the Source Code Management section.06:15
jamah, ok06:15
jamI did play with params at the beginning06:15
jamI also have to say +1 to the Bruce Schneier plugin06:18
lifeless:)06:18
jamI've seen it before, but it adds a bit of levity when browsing the results06:18
lifelesschuck norris++06:18
jamBruce Schneier's secure handshake is so strong, you won't be able to exchange keys with anyone else for days.06:18
lifelesslol06:19
jamlifeless: do you know the specifics between a 'successful build' and a 'stable' one?06:19
jamIs it returns 0 for successful06:19
jamand 'stable' is all tests pass?06:19
jaminteresting, even gives an rss feed for 'all builds' or 'all failing builds'06:20
lifelessso06:21
lifelessyou can introspect builds a bit if you build with more finesse than shell scripts06:22
lifelessand you can separate 'compiled' from 'something wrong after the compile'06:22
lifelessstable build is all tests passed06:22
lifelessunstable build is some tests failed but the build completed.06:22
lifelessthere isn't currently an interface for shell steps to indicate unstable.06:23
lifelessI was thinking of writing a plugin to look for a file 'build-unstable' to permit that.06:23
jamlifeless: I find this odd: http://weblogs.java.net/blog/2009/05/20/project-day-ssh-daemon-ec2-windows-amis06:23
jamgiven that there is already cygwin with a fully functioning ssh06:23
lifelessthere is06:24
lifelessbut it can be a little temperamental, and its much more complex than I'd want to have a remote-setup maintain06:25
lifelesswhere as this is a single jar, anda  jvm, which hudson wants anyway.06:25
lifelessjam: anyhow, glad you are enjoying it; the tz thing - I think I started to stab at it; basically subunit was sending the wrong timedness for the junitxml code06:33
lifelessjam: my inclination is just to say 'always be utc (tz) aware, because subunit generates iso timestamps, which are always given a tz.06:33
jamlifeless: Did you see my branch/06:34
jam?06:34
lifelessyes, I haven't looked at the content yet06:34
jamit implements an overly simple tzinfo class06:34
jamand then changes the line from06:34
jamdatetime.utcnow() to datetime.now(local_tz)06:35
lifelessthat seems reasonable. its a bit nuts that utcnow doesn't return, well, utc datestamps06:35
jamyeah06:35
jamanother possibility06:36
jamis to use the test start time as the first time in the stream06:36
jamI think it is actually going to be a bit broken for my use case06:36
jamsince I'm running subunit2junitxml *after* the test suite finishes06:37
lifelessI don't see why that would make it broken06:37
lifeless(but why are you running it after ?)06:37
jamlifeless: it will report a total-time of however long it takes to parse the file06:37
jamsince it takes the individual time runs based on the stream06:38
lifelesshuh ?06:38
jambut startTestRun() it takes from whenever the script starts06:38
jamlifeless: self._run_start seems to be set before any of the stream is parsed06:39
jamit is the only call that uses datestamp.utcnow()06:39
lifelessah06:39
jamall the rest return the time that got set by the call to the .time() function.06:39
lifelesssubunit doesn't have a start stream command06:40
lifelessso, thats likely a bug in subunit2junitxml06:40
jamlifeless: so if you just fixed that, it would avoid needing to call utcnow() (IME)06:40
lifelessit probably wants to reset the total time at the first explicit time() call06:40
jamright, something like that06:40
lifelessbbs06:40
jamwell, I'm heading to sleep anyway06:41
jamsubunit2pyunit seems to have the same problem, for what its worth06:42
jamRan 13835 tests in 3.475s06:42
vilajam: sleep well ! :)06:57
* vila 's not there yet06:57
* fullermd waves at vila.07:23
vilahi all07:30
* vila waves back to fullermd 07:30
* igc dinner09:09
vilaigc: ping09:18
_Andrewhi guys, quick question11:46
_Andrewhow do I produce a diff with the authors name in it11:46
_Andrewso I can send it as a patch11:46
Kamping_Kaiserbundle, iirc11:47
fijaleh12:00
fijalI seem to be caught in a dependency cyclce12:00
fijalcycle12:00
fijalhow do I get a checkout of bzr?12:00
fijalseemingly harmless question, but the repository is newer than my bzre12:01
fijalbzr12:01
Kamping_Kaiseryour not able to upgrade your bzr?12:02
fijalok, got the tarball12:02
fijalI don't want to upgrade my bzr12:02
fijalI just want a checkout12:02
fijalseems to be contradictory12:02
fijalhow do I run bzr tests?12:04
fijalbzr: ERROR: exceptions.AttributeError: 'NoneType' object has no attribute 'get_foreign_tests_branch_factory'12:07
fijalthis is what happens if I run bzr selftest12:07
fijalgreat12:08
jelmerfijal, looks like you have an old version of one of the foreign branch plugins12:17
fijalthat's great12:19
fijalhow do I tell bzr "ignore my plugins, I don't care"12:19
fijal?12:19
spivfijal: --no-plugins12:33
fijalany reason why bzr has yet-another test runner?12:36
fijalfor example, is there an option "stop at the first crash"?12:37
vilafijal: -112:54
vilafijal: there are many good reasons for that yes, one is that the full test suite run can be quite long and even just loading the python modules containing the tests is significant, so there is the --starting-with (-s option) that greatly speeds up that part.12:55
=== mrevell is now known as mrevell-lunch
spivfijal: it's basically just standard unittest with a bunch of tasteful extensions.  There's a branch from lifeless that removes a bunch of our test code and replaces it with a dependency on testtools (http://launchpad.net/testtools)13:01
__monty__How do I get to know the bzr source? Do I start at setup.py and follow every outside call?13:19
=== CardinalXiminez_ is now known as CardinalFang
james_w__monty__: bzrlib/builtins.py might be a good place to start13:21
james_wit's the top-level for each of the commands you know and love13:21
james_wso you can see the sort of thing you have to do to display the history in "bzr log"13:21
rubbs__monty__: what james_w said. That and there are some dev docs here : http://doc.bazaar-vcs.org/developers/13:22
__monty__Ok thanks you guys.13:22
rubbs__monty__: np. good luck13:22
=== mrevell-lunch is now known as mrevell
Mezhardy PPA isn't building.13:48
Mez  bzr: Depends: python-central (>= 0.6.11) but 0.6.7ubuntu0.1 is to be installed13:48
Mezsorry, isn't installable.13:48
Meznvm, my mistake13:51
jamvila: looks like you had a good start to your piloting :)14:44
vilajam: thanks for the support :)14:45
=== Noldorin_ is now known as Noldorin
vilaExcept for the remaining doc ones that I hope igc will look into soon, I think all mps got at least one comment and only one is still waiting for some work from me (deprecation warning).14:49
vilaNobody has voluntereed (sp?) for next week though...14:50
zniki am getting this error: bzr: ERROR: Not a branch: "bzr+ssh://bazaar.launchpad.net/~flavour/sahana/sahana-trunk/".14:54
james_wwhy can't I find <built-in function utf_8_encode> in the python 2.6 docs?14:56
james_wand why does it seem to be trying to encode to ascii?14:56
james_wznik: running what command?14:57
jelmerjames_w: it's in codecs14:57
znikjames_w:  bzr branch lp:~flavour/sahana/sahana-trunk sahana14:57
james_wznik: do you want lp:sahana/sahanapy14:58
james_w?14:58
james_wjelmer: yeah, I can't find it14:58
vilajames_w: str.encode('utf8') ?14:58
znikjames_w: ohh sorry imissed the py!!14:58
james_wvila: it's in bzr14:59
jelmerjames_w: what gives you the impression it encodes to ascii?14:59
james_wUnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 12: ordinal not in range(128)14:59
jelmerjames_w: that suggests you're passing in a plain string, not a unicode string15:00
james_wI'm trying to pass in the result of <string>.decode("utf-8")15:01
vilajames_w: it's implemented in C: ./Modules/_codecsmodule.c:684:utf_8_encode(PyObject *self,15:02
=== znik is now known as assad
vilajames_w: it's weird that you get a UnicodeDecodeError if you're *enc*oding15:03
james_wah15:03
calvin1602Hi. I'm deperately looking for PQM documentation.15:03
calvin1602Any help ? :)15:04
james_wso it's presumably the str = PyUnicode_FromObject(str); that is failing15:04
vilajames_w: ECONTEXT15:04
assadjames_w: i am getting a permission denied. do i have to ask the moderators for permission15:04
james_wvila: in the function you just pointed too15:04
james_wassad: doing what?15:05
assadjames_w: bzr branch lp:~flavour/sahana/sahana-trunk sahana15:05
vilajames_w: if you passed in an unicode string that shouldn't occured15:06
james_wI must be passing a plain string as jelmer suggested15:06
james_wI'm looking now to see if re is getting in the way15:07
james_wor something isn't doing what I think15:07
james_wassad: I don't see why that would give a permission denied. Could you pastebin the output please?15:07
vilajames_w: osutils.safe_utf8 and safe_unicode may help if in doubt15:08
calvin1602BzrDocsRock pretends that it is 90% complete, but there is no trace of it ...15:08
calvin1602and there is a question about it on launchpad, with no answer15:10
assadjames_w: http://pastebin.com/d33d8e51015:10
james_wcalvin1602: I don't know of any, sorry15:10
james_wassad: don't run with sudo15:11
jamassad: "Permission denied (publickey)."15:11
jamsomething is wrong with your ssh key when connecting15:11
jampossibly because of sudo15:11
assadjames_w: http://pastebin.com/d6944f64f15:12
james_wassad: "sudo rm -r sahana"15:13
james_wthen try "bzr branch ..." again15:13
james_wwithout sudo15:13
assadok15:13
assadjames_w: no such file or directory. cant remove 'sahana'15:14
james_wassad: perhaps the permissions on /home/user/Downloads/web2py/applications/ don't allow your user to write there15:16
assadjames_w: that is why  i did the sudo bzr branch .. !15:17
assadstill i wasnt able to !15:17
james_wthat was because root can't access you ssh key15:18
james_wI suggest you allow your user to write to your own home folder15:18
james_wsudo chown -R user /home/user/Downloads/web2py15:18
james_wor your username if it is not in fact "user"15:19
assadjames_w: its working now!!15:20
james_wnice15:21
assadthanks15:21
lamontwth does 'pretifying graph' mean, bzr-gtk?15:28
vilalamont: mostly loading the whole ancestry and building the graphical version15:45
rubbsIs their any way to remove the history of a HUGE file in a shared repo? I was dumb as a newbie and trying to backup my shared repo is slow and big because I once committed a big file, and my repo is fairly big, and I don't need that file or that history (I was playing around, dumb I know).15:51
rubbssorry run on sentence there15:52
=== beuno is now known as beuno-lunch
=== oubiwann_ is now known as oubiwann
NfNitLoopwell, as long as the file is in the history of one of your branches, and you're not doing a lightweight or stacked checkout, you need that large file in your shared repo to have a complete history.16:06
NfNitLoopif it's been a while, you could create a branch of the revision just before you added it.16:07
lamontvila: I suspect it wanted to use the (also non-word) 'prettifying"16:07
NfNitLoopthen merge in all changes except the one that added that big file.16:08
vilalamont: you mean the code or the feature ? Did you try qlog instead >16:08
vila?16:08
lamontvila: it was more that I failed totally to understand the origins/roots of 'pretify' - if it's based on 'pretty', then it needs a second 't'16:09
lamontthis is in the messages spit out in 'bzr visualise'16:10
vilalamont: oooook, I can fix that:)16:10
lamontjust wasn't sure if I was missing some new tech term, or if it was a bug16:11
rubbsNfNitLoop: I was afraid of that. Ok no biggie. I'll just deal with it.16:12
vilalamont: hehe, many non-native english speakers have contributed here, thanks for helping them :)16:13
lamontI speak 'merican, not English :-D16:14
vilamerican girls are pretty too so that should be good ;)16:14
rubbsNfNitLoop: the merge idea is nice, but i have 3 or for more branches that were created after my mistake, and are still in on going development, so I'm just going to deal with it for a while. I might take your suggestion and do the merge later16:14
lamontvila: I'm not supposed to notice, other than my wife16:14
vilalamont: looking is not the same as touching, I have full permissions to look :)16:15
lamontheh16:15
rubbslamont: my fiancee said this to me : "Just because I'm on a diet, doesn't mean I can't look at the menu." Of course when I look at the menu, I get in trouble ;)16:16
vilalamont: How can you still compliment here if you can't compare... There is a lot of good reasons to keep looking :)16:16
rubbsvila: haha good one.16:16
vilarubbs: here is a even worse: Just because I have lots of good bottles in my basement doesn't mean I can't have a beer at the bar...16:17
vilaThis one is really horrible because she just can't deny it :)16:17
rubbsI don't think that'd go over well, but it is pretty funny16:18
vilarubbs: of course that don't go, that's why it's horrible: if accepted it covers far more than just looking :)16:19
rubbsvila: true enough.16:21
assadjames_w: bzr was working but after some time i got this error:   bzr branch lp:~flavour/sahana/sahanapy-trunk sahanabzr: ERROR: [Errno 13] Permission denied16:25
james_wyou must still have strange permissions on your local disk16:28
assadjames_w: should i work with root?16:28
james_wassad: you shouldn't need to16:34
assadjames_w: bzr does work for some time "fetching revision: inserting streams" after which i get the error!!16:36
pindongahi. I am trying to branch a project from launchpad, but I am behind a squid proxy and a firewall that block ssh access... is there any way I can branch the project?16:37
cody-somervillepindonga, http16:37
pindongaI tried, but I keep getting errors16:37
pindongabzr branch https://code.launchpad.net/...16:38
pindongaand I get bzr: ERROR: Transport error: Server refuses to fulfill the request (403 Forbidden)16:38
cody-somervillebazaar.launchpad.net16:39
pindongacody-somerville: how can I find out the correct url for my project?16:43
pindongausing bazaar.launchpad.net?16:43
=== beuno-lunch is now known as beuno
jampindonga: generally it is "http://bazaar.launchpad.net/~user/project/branch"16:49
jamhttps generally redirects16:49
jambut as it is https you may encounter different issues, versus going straight to the target.16:49
pindongajam, indeed, I am getting some issues, if I do bzr branch https://bazaar.launchpad.net/~ricardokirkner/lalita/sentry I get 'Not a branch', if I do branch bzr+https I get 'Generic bzr smart protocol error: Invalid http response for [...] Unable to handle http code 404: Not found'16:51
jamthere is no bzr+https on that location16:52
jamneither https16:52
jamjust "http"16:52
jamhttp://bazaar.launchpad.net/~ricardokirkner/lalita/sentry16:52
jamthis seems to work for me: bzr branch http://bazaar.launchpad.net/~ricardokirkner/lalita/sentry16:53
pindongajam, yes, you are right16:53
pindongathx16:53
pindonganow, if I want to push stuff, do I have to do that through http?16:54
pindongais there no support for https?16:54
beunopindonga, just use lp:~ricardokirkner/lalita/sentry16:54
beunomake sure you've specified your launchpad-login16:54
pindongabeuno, I cannot . I am behind an http proxy and firewall that blocks ssh16:54
beunoand that your ssh key is up on launchpad16:54
beunopindonga, ssh or sftp are the only ways of pushing up data16:55
pindongabeuno, do you know where I can read about this? (I mean the underlying reasons for not supporting anything besides ssh/sftp)16:55
beunopindonga, I don't think there is anything documented16:56
beunoI also don't know of any other services that let you write through http16:56
pindongano, that's why https would be good16:56
beunopindonga, http and https would be almost the same to support really16:57
pindongaI know of two services that let you write through https: googlecode and bitbucket :-)16:59
pindongais there anything that can be done to support https directly?17:00
beunopindonga, you can try bringing up the topic on the launchpad-dev mailing list17:00
beunobut considering there isn't a bzr smart server for http, and the cost of developing and maintaining an extra moving part, it seems unlikely to happen17:01
pindongaok, thx17:02
saedelaerehi17:45
saedelaerei have a little project and started to use bazaar recently. this is my first version control system so I'am quite inexperienced.17:51
saedelaerenow, i want to release a new stable release of my software. after that i want to start with the next development branch.17:51
saedelaere the problem is what happens if there are bugs in the stable release. i would need to make an update for this version. do i need to start a new branch after releasing my stable version?17:51
beunosaedelaere, there are many different ways of handling these things17:51
beunoone way would be to always have a "trunk"17:52
beunotrunk is where you develop17:52
beunowhen you release, you branch off, and keep that separate17:52
beunoany updates you need to do to the release, you do on the release branch17:52
saedelaereok i started, with bazaar using one of the tutorials on the homepage. in fact i'am working alone on this project if this important. so what would i need to do now?17:55
saedelaerethis is the output of [bzr info]17:56
saedelaerehttp://pastebin.org/6317217:56
* beuno looks17:58
beunosaedelaere, you are ready to release?17:58
saedelaereups sry pidgin crashed18:00
saedelaerebeuno: no I'am not ready now :) i hope next week. i just wanted to ask now to be able to start right away.18:02
saedelaereis it complicated`18:02
saedelaerebeuno still here? :)18:09
=== deryck is now known as deryck[lunch]
saedelaereso is it correct to go to my working directory.18:33
saedelaerebzr branch bzr://tv-viewer.bzr.sourceforge.net/bzrroot/tv-viewer tv-viewer.08118:33
saedelaerethis creates a new directory tv-viewer.081 correct?18:33
saedelaerenow i could work on this branch if there are any bugs and even push them back to sourceforge. so this will also create a new directory there?!18:33
saedelaereomg i'am unsure and don't want to mess it up18:33
saedelaereok just played around with it in virtualbox. it created a new directory as i supposed. should i add this directory now to ignore files?18:43
=== gutworth_ is now known as gutworth
meuserjAt some point an upgrade cause the following error to happen on most of my branches in a shared repository:18:51
meuserjhttp://pastebin.com/d48d63a4018:51
Typhwhat's the best practice for moving a versioned directory somewhere else within the project19:09
gutworthbzr mv19:09
TyphI tried that but it complains the destination was unversioned. Of course it's unversioned, it doesn't exist yet19:10
Typhor should I create the required dirs, add them, then bzr mv the files19:11
gutworthadd it then19:12
rubbsTyph: you could try to move them with mv and then do a bzr mv19:12
rubbsread : bzr help mv19:12
rubbsit says that if the old file exists only in the versioning and not on the fs, and the new name is on the fs but not versioned, it will assume you moved to the new location19:13
Typhso it does. shame on me :)19:13
rubbsTyph: np. it happens, I didn't know until I looked19:16
=== deryck[lunch] is now known as deryck
NfNitLoopHrmm, reading 'bzr help branch' and --hardlink supposedly "Hard-link[s] working-tree files where possible."19:52
NfNitLoopworking tree files!?   so if I change something in one branch it updates the other?19:53
NfNitLoopThat seems wrong.19:53
gutworthNfNitLoop: hard links are not like symbolic links19:59
fullermdNfNitLoop: Well, theoretically you'd only use it with an edit{or,ing method} that breaks the link...20:19
NfNitLoopgutworth: I know hard links aren't like symbolic links, but with hard links you have two filenames pointing to the same content.20:20
fullermdsaedelaere: Ignore file?  Maybe I mis-skimmed what you're trying to do, but I don't see how that would fit in...20:20
NfNitLoopfullermd: ah, I didn't know there were editors that did that.20:20
NfNitLoopdoes bzr hardlink its pack files / revisions?20:21
fullermdNo.20:21
fullermdSeems to me somebody hacked up a patch to do it once, but it's just an unpleasant idea all 'round.20:21
fullermd(of course, so's linking the working tree, but...)20:21
meuserjok.. still can't figure out my problem.. but I get a bit more info from bzr info:20:24
meuserjhttp://pastebin.com/d3202ab9d20:24
fullermdWhat happens if you run check on the repo?20:25
meuserjfullermd: on each branch which I'm having a problem with, I get this error:20:34
fullermdNo, not on the branch.  Just the repo.20:34
fullermdI suspect the problem is a mismatch; not that something back in the ancestry went off somewhere, but that the branch is pointing at a head that's not in the repo.20:35
fullermdI can think of various ways to make that happen, but they mostly involve sneaky manual poking around behind bzr's back.20:35
meuserjfound error:Internal check failed: revno does not match len(mainline) <some integer> != -120:37
meuserjerr..20:37
meuserjfound error:Internal check failed: revno does not match len(mainline) integer != -120:37
meuserjand "integer" is some integer which seems to be different for every branch20:37
fullermdThat's expected if they're pointing at things not in the repo.20:37
meuserjfullermd: I get those branch errors when I run check on the repo20:37
fullermdDo an info -v on JUST the repository.20:37
meuserjhttp://pastebin.com/d334cc37720:38
fullermdOK, so it's not empty.20:39
fullermdBut it doesn't have any of the revs the branches are pointing at.20:39
fullermdI don't know how you'd provoke that, short of manually moving stuff across the repo boundary.20:39
meuserjso, how do I fix it?20:40
fullermdWell, how'd you cause it?   8-}20:40
meuserjI didn't.. this is happing on branches which haven't had any activity for months, and have never been moved around.20:41
meuserjerr happening20:41
fullermdMaybe you made an interposing repository somewhere along the line?20:42
meuserjinterposing repository?20:42
fullermde.g., you have all these branches in /var/projects/{a,b,c}, which are using a repo in /var.20:43
fullermdYou make a new repo in /var/projects/20:43
meuserjno20:43
fullermdThat hijacks the search, so it never finds or checks the repo in /var that actually has the revs.20:43
meuserjeverything has been in /var/projects since we created the repository years ago.20:43
fullermdMmm.  You mentioned an upgrade.  Is that recent?20:45
meuserjfor some of the branches I've been able to recover things by finding a separate up-to-date branch, and pushing + overwriting the branch in the central repo.. but I may not be able to find branches for older code...20:46
meuserjwell, I upgraded to 2.0 a few months ago.. I typically keep up to date with BZR20:46
meuserjand upgrade the repository and branch formats.. since you have to20:46
fullermdMaybe those branches that are having errors were (for whatever reason) not using the repo before, and something in the upgrade errored before updating their in-branch repos.20:47
fullermdYou sure the upgrades completed successfully?20:47
meuserjI believe so20:49
meuserjI would have looked at it then if I had errors20:49
fullermdAre the backup.bzr/ dirs still around?20:49
meuserjyeah20:49
fullermdOr are they backup_bzr?  Something like that...20:49
fullermdAh, good.20:49
fullermdSee if any of them have a repository/ directory in them, and the current .bzr/ doesn't.20:50
meuserjnope... a few have a repository directory in both20:54
Pengfullermd: backup.bzr20:57
fullermdIf you do an 'info' on those that have it in both, do they show up as standalone, or are they still trying to use the shared repo?21:00
fullermd(and is there any correlation to those that are erroring?)21:00
meuserjStandalone, and no correlation21:02
fullermdGrr.  I'm going to give you another opportunity to change your answer   :)21:03
fullermdAnything interesting in the backup.bzr/'s of the branches having issues?21:03
fullermdIs the listed head rev the same, frex?  (don't know why it wouldn't be, but...)21:04
meuserjlet me get a list of ones I know there are problems with and see if I can find some common ground.. hold on.21:04
* meuserj sighs21:16
meuserjI hae 28 good branches and 34 bad ones21:16
meuserjI have more that are erroring than are good.. that's not good...21:16
fullermdWell, it could be good.21:17
fullermdIf it were just 1 branch going all stupid, you could chalk it up to the branch or repo being skr00d somehow.21:17
fullermdWith a bunch erroring in apparently the same way, it sounds more like some particular (and possibly reversable) problem.21:18
fullermdIt really sounds most like the repository the branches were using when last used isn't the same as the one currently sitting there.21:18
fullermdYou have the backup.bzr from that?21:18
fullermdYou could try restoring that in another place, and mv/cp'ing one of the failing branches into it, and see if that changes things.21:19
meuserjno, but I have a backup of the repository dir.21:19
meuserjbzr info -v for the good branches: http://pastebin.com/d23c5b6c621:25
=== Noldorin_ is now known as Noldorin
meuserjbzr info -v for the bad branches: http://pastebin.com/d7b70627c21:26
meuserjthe reason there is no branch history data for any of the "bad" branches is that bzr crashes at that point.21:27
meuserjand I didn't redirect stderr21:28
fullermdYeah, that doesn't tell anything new, it just means that it wound up asking after a revision that's not in the repo.21:28
meuserjOOoo progress..21:45
NfNitLoopoh?21:46
meuserjI copied the entire repository to anther machine to be safe and there I restored the repository.backup file, and tested one of the broken branches, and it seems to work now.21:46
NfNitLoopstrange.21:46
NfNitLoopso they just didn't get updated when you updated the repo format, likely?21:47
meuserjmaybe... I'll try upgrading it again.21:52
meuserjok.. the branches which were erroring before, seem to work now, and some of the newer branches which worked fine before are now broken in a similar way (assumingly because they have revisions which didn't exist before the upgrade)22:00
meuserjif nothing else, I can branch off the broken projects from this working copy of the repository and push --overwrite them into the central repo...22:00
meuserjdoes that sound logical?22:01
fullermdYeah, that should work.  Or go the other way; make a tmp branch in the new repo, and successively pull --overwrite all the broken ones from the old repo.22:10
fullermdDoesn't answer much about how it got broken in the first place; upgrade shouldn't (doesn't, AFAI've ever seen) throw away revs.22:11
fullermdBut it'll get you working.  You could try experimenting with redoing an upgrade on the copy of the backup, and see if it comes up again.22:11
meuserjfullermd: yeah.. my priority of course at the moment is recovering everything I can.22:12
igcmorning22:50
pooliehi all23:22
lifelesshai23:22
james_wmorning poolie and lifeless23:27
pooliehi there23:28
jelmerhi poolie, lifeless, james_w23:32
lifelesshi, bye ;)23:32
pooliei'm going to be offline a bit today23:35
poolieso if anyone wants to talk... do it now23:36
spivMaybe we like talking to ourselves ;)23:40
igchi lifeless, spiv, jelmer, james_w23:47
james_wmorning people of the future23:48
spivjames_w: I may be from the future, but I'm not a morning person!23:51
james_wheh23:53

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