/srv/irclogs.ubuntu.com/2009/06/22/#bzr.txt

lifelessspiv: ping00:09
=== Kissaki is now known as Kissaki^0ff
spivlifeless: pong00:17
lifelesswhen you were working on the missing keys stuff00:21
lifelessdid you happen to also have methods to get 'all the new revision ids' or something like that?00:22
lifelessI'm making StreamSink do a pack()00:23
lifelessbut providing only the revision ids to pack00:23
lifelessalternatively, I could make it pack with some opaque hint about the pack names to use, which commit_write_group could be modified to return00:23
lifelessI'm still undecided.00:23
spivI did, I can't remember if that method ended up landing or ditched, though...00:25
lifelesstelling you about this I've realised a race with my current approach00:27
lifelessso I am now decided, the hint has to be opaque and list the pack names.00:27
spivI either didn't have that method, or I had it and abandoned it in favour or something else (_KnitGraphIndex's track_external_parent_refs flag, maybe?)00:28
lifelessspiv: well, I don't want refs, I want something to id the packs themselves00:28
spivYeah, I prefer the sound of that approach anyway.00:28
spivRight, it doesn't help for this.00:28
SamBjelmer: is there a bzr-svn equivalent for "svnversion"?00:33
AfCSamB: http://blogs.operationaldynamics.com/andrew/software/version-control/subversion-revision.html00:35
pooliehello all00:42
pooliejml: https://edge.launchpad.net/bzr/+milestone/2.001:04
poolieit still shows a few bugs01:04
pooliehow many are actually critical i don't know01:04
lifelessFWIW I haven't attempted to categorise all the critical bugs as blockers/not blockers at this point01:06
jmllifeless, as in, there are some bugs on 2.0 marked 'critical' that might not be blockers?01:08
lifelessno01:08
lifelessas in there are bugs marked critical that might be blockers for 2.0, but not set against the milestone01:09
* SamB wonders how many GHC releases are going to go by with that critical bug in the typesystem ...01:09
lifelessusing milestones to plan releases is a new experiment for us01:09
jmlahh ok.01:09
jmlhttps://bugs.edge.launchpad.net/bzr/+bug/389272 ; https://bugs.edge.launchpad.net/bzr/+bug/376243 and https://bugs.edge.launchpad.net/bzr/+bug/365615 are the only ones I could find like that.01:10
ubottuLaunchpad bug 389272 in bzr "upgrade and root data for cached inventories in trees" [Critical,Triaged]01:10
lifelessfor regular releases I think we shouldn't ever really have bugs open against the milestone01:10
lifeless2.0 is special01:10
jmllifeless, aiui, 2.0 is special because we need some way of deciding when to change the naming convention of one of our regular releases.01:11
lifelessits special because people percieve .0 releases differently01:12
lifelessugh spellink01:12
SamB2.0 is special because it comes after 1.n01:13
lifelessSamB: so does 1.n+1 :)01:14
SamBwell, I mean, you don't even have to know what "n" is before you start planning for 2.001:14
lifelesssure :P01:14
SamBor alternatively, you have to pick an n01:15
lifelesswhat I mean though, is that people will make more of an effort to upgrade; that we are likely to be changing the default for 2.0, that rich roots will get much more exposure.01:15
lifelesswe're going to _drive_ exposure of all the little issues in the system that are currently an optional experience01:15
igcmorning all01:15
lifelessso 2.0 is more a readiness test than 'another month has passed'01:18
jmligc, good morning01:30
fullermdSpeaking of 2.0, which we weren't, I'd like to suggest we remove the 'clone' alias for it...01:34
fullermdThat would give it time to get out of circulation and cut down on surprise when we re-used it in 3.0 for cloning multi-branch repos...01:35
lifelessfullermd: put a patch up01:36
lifelessfullermd: I'm ambivalent; I think you're prematurely judging what the ui changes will be. OTOH clone is the source of some confusion today.01:37
fullermdWell, I am.  OTOH, it's an excellent word for it, matches 'git clone', and probably should be de-made a copy of 'branch' ASAP if it's ever going to come into usage meaning something rather different, so...01:38
fullermdI'll try banging something together for the list later; wouldn't want to bother if I could just hop on IRC and get told "WTF, no".01:39
lifelessI mean; specifically, we have multibranch repos today01:39
lifelesstheres no real need to have the deep problems fixed to make the change you want today01:39
lifelessclone URL could just clone the entire structure today01:40
lifelessthe things I'm interested in for 3.0 are removing the sand grains01:40
fullermdWould you prefer I said "git style branches"?   :p01:40
lifelessif you said that, I'd feel even more like you're prejudging01:41
fullermdAnyway, my rush wasn't so much the changes, as that moving clone instantly from being an alias for 'branch' to being a totally different command is unpleasant, and it'd be better to give it a while of being nothing in the middle, to get people away from it.01:41
lifelessI think we'll have to change much more than simply clone to do 3.0 :) If you want to do this work on clone, its fine with me.01:42
* fullermd thinks you're reading a LOT more into this...01:43
lifelesscould be ;)01:43
fullermdAll I'm saying is "Hey, I think this is a command we'll want to use for XYZ in the future, we should stop making it mean ABC ASAP"01:44
fullermdThat was we have all 2.x for people to start using 'bzr branch' instead of 'bzr clone', so they're not unpleasantly surprised out of the blue when it changes.01:44
lifelessAll I'm saying is 'using it for XYZ isn't clear to me, and perhaps using it for ABC will still be appropriate. But hey, it causes confusing on ABC at the moment so changing it might be good anyway'01:44
lifelessfullermd: w.r.t. avoiding confusion, I'm fairly sure 'bzr branch' will change *too*, so I'm not buying the avoiding-of-surprise.01:45
fullermdWell, but I expect branch will always pretty much mean 'make a new branch based on X', give or take.  So it wouldn't be a conceptual shift, just syntax and details.01:46
fullermdOh well.  I'll try starting a bikesh^Wthread on it later.01:46
SamBfullermd: that'll still screw scripts01:47
SamByou know the one nice thing about that concept?01:47
SamB... at least those nuclear power plants only give you trouble in *making* them01:48
fullermdI was hoping it would lead to wealth and women, actually.  Oh well, back to the drawing board.01:48
poolielifeless: so, how about upgrading bzr on launchpad?02:10
pooliegood morning spiv, igc02:10
lifelesspoolie: the LOSAs are all in the UK this week02:10
lifelesspoolie: I don't think we should do anything risky until spm is at hand again02:10
poolienext monday?02:11
lifelessalso, as we have a wide variety of users, we should really plan it carefully and socialise dates etc02:11
pooliedo you know what they're doing? some kind of sprint?02:11
pooliesure02:11
pooliei'm not proposing to just run the command02:11
pooliei'm proposing to start that process though02:11
lifelessby bzr on launchpad, do you mean 'change format to 2a' ?02:11
igchi poolie02:12
poolieyes02:12
pooliehello igc02:12
igcafter a busy weekend hacking from bialix and igc, BzrExplorer hits the streets02:51
* igc lunch and medical appointment - bbl02:52
tedgUhm, bad stuff just happened.  I did a commit on a repository that had about 1900 revisions and it now said "commiting rev 1" which is scary.04:49
tedgBut doing a "bzr log" I can see that all the old revisions are there, but now my log has negative revisions in it.04:50
bialixrun `bzr reconcile`04:50
tedgbialix: Thanks, running now.04:52
lifelessreconcile won't fix that04:55
lifelessthere is a bug open about doing 'bzr init + bzr merge + bzr commit' doing this04:56
lifelessbut we've not seen anything else cause it.04:56
lifelesstedg: please file a bug about how you made this happen. use your bash history and ~/.bzr.log as data for what you did to make it happen04:56
tedglifeless: I think it's because I had a commit waiting on another operation using a lock file.04:57
tedgI'm not sure if that'll show up in the log or not.04:57
lifelessif so its a huge bug04:57
lifelessgather as much data as you can04:58
lifelessfile a bug04:58
lifelesstry to reproduce04:58
* tedg is still waiting on reconcile...04:58
bialixigc: I've made tar.gz and installer and upload them04:59
bialixigc1: hi05:17
igc1hi bialix!05:17
bialixhi!05:17
bialixI've upload release tarball and installer05:17
igc1I'm just looking for them now05:17
bialixdo you want to provide the links for these files at wiki?05:17
bialixhttps://launchpad.net/bzr-explorer/trunk/0.305:18
igc1yes please05:18
bialixhttps://launchpad.net/bzr-explorer/+download05:18
igc1I'll update the main overview page on lp too05:18
bialixigc1: there: http://bazaar-vcs.org/BzrExplorer ?05:19
bialixor made additiona page http://bazaar-vcs.org/BzrExplorer/Download05:20
igc1bialix: just updating the main page is good enough for now I think05:22
tedgWow, reconcile is taking forever.  Do I want to know what it's doing?  30m of CPU time for bazaar at this point.05:23
bialixadded link to https://launchpad.net/bzr-explorer/+download05:23
bialixigc1: btw, I've tried to hook in double click event handler for wt view, and failed. I'm not sure why05:25
bialixI'm not expert in Qt :-/05:26
igc1bialix: thanks for trying. My naive attempt at it failed as well, hence my email to garyvdm05:26
bialixI suspect it's related to QDirModel05:26
=== afk is now known as mthaddon
bialixigc1: I don't see the way to edit hats05:31
lifelesstedg: reconcile won't help you05:32
lifelesstedg: you don't need to run it for the problem you had05:32
bialixthanks for your sample with bookmarks/tags, it looks interesting05:33
tedglifeless: Yes, but canceling in the middle seems like a bad idea, eh?05:33
lifelessctrl-C05:33
bialixlifeless: IIRC spiv added code to fix wrong revno05:33
tedglifeless: s/life/fear/05:33
* tedg is more scared of bazaar than that :)05:33
lifelessbialix: I don't see anything to do that in log05:34
lifelesstedg: bzr is designed to be as robust as possible05:35
lifelessctrl-C shouldn't ever be more risky than using it over the internet.05:35
* tedg is going to have to stop using bazaar over the Internet.05:37
tedg:)05:37
poolielifeless, mwh, jml, thumper, i filed bug 390502 re upgrading to 2a05:37
ubottuLaunchpad bug 390502 in bzr "bzr's development should dogfood format 2a" [High,Confirmed] https://launchpad.net/bugs/39050205:37
lifelesspoolie: ah, so that was what you meant :)05:38
mwhudsoncool05:38
tedglifeless: Hah, well, whether I'm crazy or not.  Even running reconcile for that amount of time fixed my revno05:38
poolieaddition/comments/etc welcome05:38
lifelesstedg: very odd :P05:38
mwhudsonlet us know if we can help, but doing it without losas around will be a pain i expect05:38
thumper:)05:38
lifelessbialix: jam did change reconcile, but didn't put it in a commit message.05:38
poolieare they have a sprint or something?05:39
lifelessbialix: thanks for letting me know of that05:39
poolieapparently yes05:39
lifelessyes, LOSA sprint05:39
pooliei see the mail now05:39
bialixlifeless: I remember discussion on it05:40
=== mthaddon is now known as afk
tedgOkay, I've documented everything in bug 390490 -- I'm not sure what the status should be now.  Thanks lifeless and bialix!05:41
ubottuLaunchpad bug 390490 in bzr "Revno reset to 1, others now negative" [Undecided,New] https://launchpad.net/bugs/39049005:41
Peng_Should other related projects upgrade to 2a too? Several (bzr-svn, bzrtools, Loggerhead) already use rich roots, making it a lot easier.05:53
lifelesstheir devs should be dogfooding locally already05:53
lifelessmoving mainline forces all devs to be using 1.1605:53
lifelessthats somewhat more reasonable for bzr itself05:53
Peng_FWIW, I have a copy of Loggerhead in 2a -- https://code.edge.launchpad.net/~mnordhoff/+junk/trunk.2a05:53
Peng_Heh, I'm not dogfooding 2a locally. :D05:54
Peng_Converting between packs/btrees and 2a on every push and pull would be slow, no?05:54
fullermdI've got a 2a branch, that I don't use of code that's maintained in CVS  ;)05:55
Peng_Heh.05:55
Peng_Does stacking, say, a 1.9-rich-root branch on a 2a branch work?05:56
jmlI haven't tried :)05:57
Peng_I think I've heard bad things about stacking and differing serializer formats.05:58
Peng_I don't use stacking at all (well, except for LP's mirrors of my branches), but...05:58
fullermdWell, bzr.dev still has the nested trees issue keeping it from upgrade'ing on that route.05:58
fullermdI was GONNA say 1.16 will do it, but so far it's burned about a minute and a half of CPU trying to upgrade a repo with no revisions...05:59
lifelesspoolie: no05:59
lifelessyou can't stack across formats05:59
Peng_What about minor format changes, like 1.6 to 1.9?06:00
lifelessI'd need to check. We don't support it even if it happens to work06:00
lifeless:)06:00
fullermdWhoah, that's wacked out...06:01
* fullermd files a bug.06:01
lifelessjml: I have had a merge proposal I sent it get ignored, or something06:01
lifelessjml: what should I do06:02
Peng_Back to my other question, does converting between rich-root-pack or 1.9-rich-root and 2a on every push and pull cause significant performance problems?06:03
Peng_I suppose I should just test it myself.06:03
lifelessits probably terrible at the moment06:03
lifelessthere are two bugs open06:03
Peng_That would make dogfooding 2a on one's own a bad idea, then.06:05
jmllifeless, is it this bug? https://bugs.edge.launchpad.net/launchpad-code/+bug/38768306:06
ubottuLaunchpad bug 387683 in launchpad-code "Cover letter for emailed merge proposal silently discarded" [High,In progress]06:06
lifelessno06:07
lifelessI've just sent a bug mail for it in fact06:07
lifelesswell, I say no, but what I mean is, the summary makes me think no.06:07
lifelessjml: no, its nt06:09
lifelessjml: I had a branch created, absent the correct metadata, absent the merge proposals revisions06:09
lifelesspoolie: I think we should wait to move bzr for launchpad to be able to upgrade our branches06:09
lifelesspoolie: [even if 'upgrade our branches means a LOSA for-script']06:10
jmllifeless, I'm reminded that there is a known bug such that errors during merge proposal creation are not reported.06:17
lifelessjml: once you've gathered any data you need, I'll push and manually submit for merge06:19
jmllifeless, I'm not going to do any data gathering on that today, sorry.06:20
=== afk is now known as mthaddon
lifelessjml: tomorrow morning?06:21
lifelesspoolie: so you object to the class name in my branch?06:22
jmllifeless, I'd just push it and manually submit it if I were you.06:24
jmllifeless, https://bugs.edge.launchpad.net/launchpad-code/+bug/37620406:24
ubottuLaunchpad bug 376204 in launchpad-code "Create merge proposal job doesn't send failure email" [High,Triaged]06:24
jmllifeless, that's probably the bug you are seeing. I'll be able to do more when I get the oops report tomorrow06:24
jmlassuming I am at leisure to look at the bug.06:24
poolielifeless: i do object to the class name07:01
pooliei think you should fix it07:01
poolielifeless: you mean wait for launchpad rather than, for argument's sake, doing the upgrades over sftp?07:01
pooliefair enough07:01
poolienow to escape from bug mail07:02
lifelesspoolie: ok, I'll change it. FWIW I chose it deliberately for more clarity in the class07:02
lifelessbut I'm not deeply attached07:02
pooliethe thing is it doesn't *mean* apha07:04
pooliealpha*07:04
poolietherefore it's not more clear07:04
lifelesswell07:04
lifelessI'm confused by what it means then07:04
poolieit is the first 2-series format07:04
pooliei know i owe bzr a doc patch on this07:05
pooliebut there was a thread about it07:05
lifelesswill the next be 2b rather than e,g. 2.3?07:05
poolieyes07:05
* lifeless is apparently totally confused07:05
pooliethe point is:07:05
poolieit's hard to tell whether a format will change on disk between alpha testing and final release07:05
poolieand it's hard to tell precisely which release it will land in07:06
poolieand it's hard to tell which will be "the" format for 2.007:06
poolietherefore, let's not put them into the symbol that names the on disk format07:07
lifelessif we get into this, I'll be wasting your time I think. So lets not. I'll re-read the thread and see if I can understand this time around. Because we put them into the on disk format to solve other issues07:07
lifelessand we didn't have any difficulty with the first two points for the last 3 or so formats before 2a07:07
pooliei'll try to finish things currently in train and then do a doc patch07:07
poolieand we can discuss it there07:07
lifelessI think not putting it into the disk format is a mistake, and if I failed to make that clear earlier, I'm really sorry.07:08
poolieputting what in?07:09
lifelesslets pause the conversation. I'll dig up the thread; it may be totally convincing.07:10
abentleylifeless: Any idea how long it takes to reconcile a launchpad repository in 0.2a?  I started on Friday, and it's still going...07:15
fullermdpoolie: I don't understand "what does dev do specifically?"07:19
lifelessabentley: uhm, a while.07:19
lifelessabentley: is it thrashing?07:19
lifelesspoolie: what was the thread name?07:20
abentleylifeless: load average is ~1.4, 1 CPU core is maxed.07:20
lifelessabentley: thats longer than I would have expected07:21
abentleyYeah, me too.07:21
abentleylifeless: It also has some old bzrs in it, but still...07:21
abentleyIt's spinning the spinner, fwiw.07:23
abentleyBut it's been in "Reconciling repository:repacking texts:Finding text refe" since Friday.07:23
vilahi all07:26
* fullermd waves at vila.07:27
* vila waves back 07:27
AfCabentley: Maybe `bzr reconcile` is subject to a Red Giant Bug :)07:32
=== mthaddon is now known as afk
lifelessigc1: I can work on iter_changes tomorrow07:57
igc1lifeless: cool08:00
igc1hi vila!08:00
vilaigc1: hi Ian !08:00
lifelesshi vila08:01
vilalifeless: hi Rob ;-D08:01
* lifeless EOD's08:02
=== afk is now known as mthaddon
bialixigc1: we have broken release08:26
igc1bialix: I'm just about to pack it in for the day08:27
igc1bialix : is it osmething you need me for?08:27
igc1or it is installer packaging, say?08:27
bialixno, I'm fixing it right now and will release 0.3.108:27
igc1cool08:28
bialixno, this is broken sources08:28
bialixdelete all pyc/pyo files from your sources and try to run bzr explorer08:28
bialixhttps://bugs.launchpad.net/bzr-explorer/+bug/39053908:28
ubottuLaunchpad bug 390539 in bzr-explorer "Installation fails on Windows [bzr 1.16, bzre 0.3/0.4]" [Critical,In progress]08:28
bialixoption --app-suite broken08:29
igc1oops - sorry08:29
igc1the registry is in app_suite now iirc08:29
bialixyes, I've chenged it08:30
igc1bialix: btw, I fixed that hat selection bug and applied a fix for bookmark editing on osx08:30
bialixyes, I saw08:31
bialixso, 0.3.1?08:31
igc1bialix: yep. Please do it ASAP - rev 100 (including your profile fix)08:32
bialixok08:32
igc1bialix: I need to go08:32
bialixbye08:32
* igc1 heads off to celebrate a good news day with the family - cancer all gone it seems. Hooray!08:33
igc1night all08:33
bialix!!!08:35
=== cprov1 is now known as cprov
guilhembiHello! my colleagues asks this:09:07
guilhembi"Anyone knows whether it is possible to copy a file or parts of its contents to another file and still preserve the history of the copied lines?09:07
guilhembiThe problem is that i need to copy some large code over to a new file and i would like to preserve the history of those lines. "09:07
guilhembiand I believe the answer is "no".09:07
mwhudsonyou're right09:07
vilaguilhembi: your're right, the answer is no. It's a planned feature, long term though.09:12
guilhembivila: thanks09:21
fullermdHeck, you don't need to preserve the history, you can just guess at it later.  Ask any git person.09:22
vilafullermd: joke aside, that's the reason why I often comments in commit messages about such transitions ('start implementing X based on Y')09:23
vilas/comments/put comments/09:23
vilaI started doing that back in sccs days, less so now (most of my use cases were renames which are now tracked ;-)09:24
fullermdThat would take up precious space in the commit logs I could be using to mock and belittle the client, other developers, or myself...09:25
vilathink about it as mocking the tools instead :-D09:25
fullermdOh, heck no.  I'm far too animistic to dare mocking the tools I'm currently using.  They would TOTALLY find a way to get back at me for it.09:26
* vila lol (sometimes that acronym can be used in its true original meaning :)09:27
fullermdvila: Can you take a look over the patch I just posted to the list?  It's kinda in your line.09:30
pooliehello vila09:31
vilahi poolie09:31
poolievila thanks for the emacs comment on the ui branch09:31
vilapoolie: np, thanks for working on that, I really like the design and I thought you could use some feedback from contexts you don't use on a regular basis09:32
Peng_fullermd: Oh, thanks for the patch. I ran into the bug once, but it didn't annoy me enough to track it down. :P09:33
vilafullermd: I can't believe it, I was so sure to have used '_unused' myself, looks like some modifications forgotten on my laptop when switching back to my desktop :-/09:33
fullermdpoolie: I don't understand your comment on bug 390512...09:34
ubottuLaunchpad bug 390512 in bzr "Downgrade spins on working tree" [Medium,Incomplete] https://launchpad.net/bugs/39051209:34
poolieyeah it madde me think of some more tests to add09:34
poolieabout your point of allowing the user to turn off guessing?09:34
pooliefullermd: iirc you said "it fails in bzr'dev"09:34
poolieso does it fail with a traceback?09:34
fullermdOh.  No, bzr.dev still has bug 388727 around, so it doesn't even try to do anything.09:35
ubottuLaunchpad bug 388727 in bzr "upgrade fails between dev formats" [High,Confirmed] https://launchpad.net/bugs/38872709:35
fullermdIt was a note that you have to use 1.16 to reproduce the bug.09:35
* fullermd adds a comment.09:36
vilafullermd: by the way, can you use --parallel now ? I've lost track on that.09:37
fullermdvila: --parallel wants the testtools module, which I don't have an available package for   :|09:38
pooliefullermd: but i thought bug 388727 was now merged?09:39
ubottuLaunchpad bug 388727 in bzr "upgrade fails between dev formats" [High,Confirmed] https://launchpad.net/bugs/38872709:39
vilafullermd: ha yes, thanks for the reminding, sorry about that again :-/ I think it's a python-only module, I know zilch about packaging but it shouldn't be hard :-/09:39
fullermdA fix was merged for 1.16.  AIUI, it's a somewhat hacky fix and lacks tests, which is why it wasn't put into bzr.dev.09:39
vilawow, 1.16 hasn't been merged back to bzr.dev ?09:40
fullermdvila: Yeah, but, see, if I made a package for it, some yutz would decide to stick me with maintaining it from now on   :p09:40
=== NEBAP|work is now known as NEBAP|WORK
vilafullermd: yup, I think it's kinda part of deal for using a faster selftest, the time you gain from the faster executions can be used more productively now, see ?09:41
Peng_Packages are no fun! bzr branch lp:testtools /usr/local/lib/python2.5/site-packages/ :D09:43
Peng_Or co --lightweight, I guess.09:43
fullermdHaving maintained installations with lifespans over a decade, I feel I can authoritatively say that fiddling around in /usr/local/ behind the package manager's back is *REALLY* no fun  ;p09:44
jmlPeng_: I think someone's going to package testtools rsn.09:46
vilafullermd: whereas maintaining local version in ~/lib is quite usable :-)09:46
fullermdAnyway, longer single-thread selftest just means I have more time for reading web com^W^W^Wimportant research.09:46
Peng_Running parallel selftest on my VPS is fun. Swaps a bit, but it's fast.09:49
Peng_'Course, The EC2 thing would be even faster. :D09:50
vilaPeng: swaps ! Urgh, I'm surprised it's still faster then...09:50
fullermdAh, swapping isn't slow if you arrange it right.  Gotta put swap on its own disk so it doesn't interfere with anything else, see.  I've got this 5 meg drive in the closet I can dedicate to things like that...09:52
Peng_vila: It's not that bad. Puts me maybe 20-100 MB over my total amount of RAM.09:52
lifelessalso you don't have ext3 to contend with09:52
lifelessor do you?09:52
* Peng_ 's VPS is on ext3, with swap on the same hard drives. :D09:52
vilaPeng: How much RAM does the running system have and how many concurrent selftest are spawned ?09:53
Peng_vila: How much total RAM?09:54
lifelessPeng_: are the drives real?09:54
Peng_lifeless: They exist only in my dreams. No, uh, it goes through Xen, and LVM, depending on how that works, and they're in a RAID 1 (or maybe 10) array.09:54
Peng_vila: 360 MB total, about 140 MB actively used (more if Loggerhead is feeling hungry), and 4 processes.09:55
Peng_Hardware RAID, though.09:55
lifelessPeng_: so, they are vg's in LVM? or xen disk files?09:55
vilaPeng: wow, that's tiny09:55
Peng_lifeless: Noo clue.09:56
lifeless:)09:56
Peng_lifeless: Heck, I don't even know what that question means. :D09:56
Peng_vila: Yeah, I'm cheap. :P09:56
Peng_Hmm, if they were just Xen disk files, using LVM would be pointless, no?09:58
fullermdOh, I can't `missing` a merge directive?   :(09:58
Peng_vila: Could be tinier. 6 years ago, it would've been 64 MB. :D09:59
fullermdYeah, but 6 years ago bzr used WAY less memory  :>10:00
Peng_Yes, things that don't exist don't tend to be RAM-heavy.10:01
Peng_6 years ago the test suite was REALLY fast, too. :D10:02
fullermdYeah, it didn't have any failures either.10:02
Peng_"bash: bzr: command not found" doesn't exactly sound like a success.10:03
poolievila/mwh: do you have any opinion what SilentUIFactory should do if asked for input?10:03
pooliefail? or read random stuff from stdin?10:03
pooliethe second doesn't seem really helpful10:03
fullermdPeng_: It's not bzr's fault bash has errors   :p10:03
Peng_If bzr+http uses SilentUIFactory, reading random crap from stdin sounds dangerous.10:03
vilafrom memory, SIlentUIFactory returns None which leaves upper levels decide right ?10:03
Peng_Err, wait, bzr+http uses stdin anyway. So it'd just break stuff, or do nothing.10:04
poolierun as a cgi i guess it does10:05
LarstiQdoes anybody know where johnf hangs out?10:05
pooliei think it did previously read stdin which suggests that path was never hit10:05
poolieLarstiQ: on irc but not here? not really10:05
pooliehe lives in Sydeny10:06
poolieSydney10:06
LarstiQpoolie: he pinged me over the weekend10:06
vilapoolie: yeah, looking at the code, I don't see how it can be used if input is needed... on the other hand making it *fail* can be useful for scripts that want to ensure no input is required10:08
poolieSydney10:08
poolieblah10:08
pooliei mean, "yes"10:08
vilapoolie: it's a bit strange it doesn't define get_boolean though10:09
poolieit inherits from CLIUIFactory10:09
vilapoolie: hmm, get_boolean doesn't seem to be able to return None as currently coded10:09
pooliei'm deleting that layer too10:10
pooliei don't think it's useful anymore to make a static distinction between smart and dumb terminals10:10
pooliebecause it's actually more than one dimension:10:10
pooliedoes the user want progress, is there a tty for input, is there a tty for output, etc10:10
vilaagreed10:12
vilapoolie: quick question: do you know why _btree_serializer_c.pyx is not called _btree_serializer_pyx.pyx ?10:14
poolievila, i was just wondering the same thing myself!10:15
poolieafaik it's an accident10:15
poolievila, could you merge 1.16 to trunk sometime?10:15
vilapoolie: sure10:15
Peng_bzrlib/_dirstate_helpers_c.pyx and bzrlib/_knit_load_data_c.pyx too.10:16
vilaPeng: right10:17
mwhudsonpoolie: fail10:22
Peng_fail?10:24
pooliemwhudson: win! thanks10:28
Peng_lifeless: LVM.10:28
awilkinsjelmer: Just ran into something interesting : I did `bzr version` and got prompted for auth on an SVN repo10:41
awilkinsjelmer: bzr 1.14.1 bzr-svn 0.5.410:41
awilkinsIt's not even a URI I recognize it's prompting for10:42
mbnoimiwhat the different between Bazaar and Subversion ?10:44
awilkinsmbnoimi: Subversion uses a single central repository ; Bazaar permits you to use distributed repositories10:45
awilkinsThat's the most significant difference10:45
mbnoimiwhat about the pull/push speed ?10:46
jpdsmbnoimi: http://bazaar-vcs.org/BzrVsSvn10:46
mbnoimiis bzr faster than svn?10:46
awilkinsmbnoimi: For many use-cases, yes10:46
awilkinsmbnoimi: And I'd say the critical one is merging easse10:46
awilkinsmbnoimi: It makes certain ways of working cost much less than using subversion so they become more viable, like per-feature or per-bugfix branches10:47
LenzGrmbnoimi: The good thing is that switching from svn to bzr is painless and the commandline interface is very svn-like.10:47
mbnoimiawilkins: I got10:47
mbnoimiI got it10:47
awilkinsYou make a disk-space saving on many trees, and commands like status commands are in my experience a lot faster, as are checkouts10:48
awilkins(as long as the revision data is already downloaded or present on a LAN)10:48
mbnoimibut I couldn't find any shell integration for bzr on ubuntu where there are many shell integrations for svn10:48
awilkinsmbnoimi: On win32 there is TortoiseBZR, which is not by any meaasure as mature as TortoiseSVN10:49
mbnoimiawilkins: I know it, I need one for ubuntu/Linux10:49
awilkinsOn Ubuntu.. I think there is a nautilus plugin but I think it's quite slow because of the way GVFS works10:49
LenzGrmbnoimi: Try qbzr or the bzr-gtk plugin, if you need a GUI10:50
awilkinsmbnoimi: And if you are an eclipse user, there are a couple of plugins for that10:50
fullermdDon't forget the Explorer thing that was just released...10:50
mbnoimiLenzGr: they are not shell integrations !10:50
jpdsmbnoimi: What do you mean by 'shell integration'?10:50
* awilkins has not treid that thing yet10:50
LenzGrmbnoimi: On my zsh, bzr commands expand nicely.10:50
LenzGr(If that's what you are referring to)10:50
awilkinsHe means GUI file manager integration10:51
mbnoimijpds: just like TortoiseSVN (right click)10:51
mbnoimiawilkins: could you give me a link?10:51
mbnoimiawilkins: I googled about it but I couldn't find anything10:52
awilkinsmbnoimi: nautilus-bzr is part of bzr-gtk10:52
awilkinsApparently10:53
awilkinshttp://bazaar-vcs.org/bzr-gtk10:53
awilkinsThe "Bazaar Explorer" thing sounds nice too10:53
mbnoimiawilkins: I've installed bzr-gtk but I didn't notice any thing in nautilus10:55
mbnoimiawilkins: even I looked in apt and I found nothing !10:55
awilkinsmbnoimi: Do you have the GNOME Python bindings installed?10:55
mbnoimiawilkins: I didn't see it in Synaptic ?10:57
mbnoimiawilkins: so I'm not sure if it's installed10:57
awilkinsYou want python-gnome2-desktop10:57
mbnoimiawilkins: yes, I got it. It installed10:58
mbnoimiawilkins: how I can be sure that nautilus-bzr is working correctly ? From my side I didn't see any action in right menu in nautilus11:00
awilkinsNeither do I ; I'm not sure how you configure it11:00
mbnoimiawilkins: I just installed bzr-gtk from Synaptic nothing else11:01
awilkinsI'm afraid I don't know then ; I'm usually content to use the CLI and spawn qbzr windows from the command line when I need some GUI lovin'11:04
mbnoimiawilkins: anyway thanks for help, I'll migrate my repos from SVN to bzr today11:05
awilkinsmbnoimi: I use it in parallel with the SVN repos at work successfully11:06
awilkinsmbnoimi: It's hard to change peoples habits with version control ; even when you're the guy who migrated them to SVN in the first place..../11:06
fullermdawilkins: Well, once they've seen you push svn on them, why _would_ they ever listen to you again?   ;>11:08
awilkinsfullermd: In fairness, this was before Bazaar was in version numbers mod 111:08
awilkinsfullermd: And they'd spent 2 years deliberating on whether to use CVS or Visual SourceSafe11:09
mbnoimibefore leaving, in SVN I can specify access rules of svn repos by editing passwd & authz files. In bzr I couldn't find any document talking about access rules, could you tell me how I can specifying that rules?11:09
awilkinsfullermd: :-p11:09
awilkinsmbnoimi: There are no access rules except access to full tree11:09
awilkinsmbnoimi: Bazaar itself has no access rules, you configure access to the transports you use11:10
awilkinsmbnoimi: It's a bit silly to try and restrict access to subtrees in a VCS where everyone has a copy of the whole repository11:10
mbnoimihummm, but I want to make some folders just for read only and the others forbidden11:10
awilkinsmbnoimi: Aside from breaking those folders into seperate branches, can't be done11:11
fullermdOh, you could probably do something with a pre_commit hook on the "central" branch to prevent undesirables from being responsible for changes to given areas.11:12
mbnoimiawilkins: we're programing team in a commercial company so there are many access rules needed11:12
fullermdBut there's nothing you could do about what they do in their own local branches.  They're root there, after all.11:12
mbnoimifullermd: that's mean bzr not suitable for commercial usage !11:14
fullermdNot necessarily, it just means you have to think about things differently than you do in svn.11:15
mbnoimifullermd: access rules are very important in our case11:15
fullermdDon't think about the access rules you have now; think about what you're trying to _accomplish_ with those access rules.11:15
fullermdFor instance, you have sections of the tree that are read-only [for certain users].11:16
fullermdNow, how are you preventing them from changing those files locally in their svn checkout (but not committing the changes)?11:16
fullermdThe answer almost certainly is "you're not, you can't, that's ridiculous".  What you're actually trying to do is not prevent them _changing_ the files, but prevent them _checking in_ changes to the files.11:17
mbnoimifullermd: I can preventing them from committing , that's it11:17
fullermdSo a hook on the "central" server saying "only these people can check in/merge/etc revisions that change these files" accomplishes the same thing.11:17
fullermdYou can't assuredly  do anything about them committing changes there in their local branches, but that's equivalent to them making local changes in their svn checkouts; it doesn't affect anybody but them.11:18
* fullermd sprinkles a few more pronouns into that sentence, just to make his English teachers twitch.11:18
fullermd(I'm somewhat sure pre_commit hooks could currently do that.  If they can't, it's probably a bug, and they should be able to.)11:20
jelmer_awilkins: you need a newer version of bzr-svn11:24
jelmer_SamB: 'bzr version-info'11:24
awilkinsjelmer_: Thanks, just updating server :-) ; was a weird link though, never touched it. It's recognizably something to do with the server it's on but not something I would touch11:24
LarstiQmoin jelmer_11:27
awilkinsjelmer_: Still doing it with bzr 1.16 / bzr-svn 0.6.2 / subvertpy 0.6.811:29
awilkinsjelmer_: Although the link it's trying to auth with has changed11:29
johnf1LarstiQ: I see I don't have to bug you abut bzr-svn :)11:30
LarstiQjohnf1: you already did over the weekend, and today I saw those pings ;)11:30
jelmer_awilkins: what's the sort of URL its prompting for?11:30
LarstiQjohnf1: thanks for doing so btw11:31
jelmer_mbnoimi: there is nautilusbzr, included with bzr-gtk11:31
LarstiQjohnf1: all left now is to give the packages some test spins, and then they can be copied over11:31
jelmer_mbnoimi: it's experimental though11:31
awilkinsjelmer_: https://cubit.extranet.collab.net/svn/cubit11:31
awilkinsjelmer_: This is on a Collabnet CuBIT server11:31
awilkinsjelmer_: Before it was https://cubit.extranet.collab.net/svn/cubit/branches/hilarity/ui/extauth/cubit-skel11:32
jelmer_awilkins: that requires authentication here, even with svn11:32
awilkinsjelmer_: But I've no plausible reason why it would try accessing it from a "bzr version"11:32
LarstiQjelmer_: are you still using https://edge.launchpad.net/subvertpy/+download ?11:33
jelmer_awilkins: no idea11:33
jelmer_LarstiQ: no, http://samba.org/~jelmer/subvertpy/11:33
awilkinsjelmer_: pull seems to work fine (seems a bit quicker too)11:34
awilkinsWhen you run from your local folder, do you have to copy the extensions to the bzrlib folder to use them?11:34
LarstiQjelmer_: can you point launchpad's download page at that?11:36
jelmer_LarstiQ: It's set up to, but that feature seems to've broken recently11:37
awilkinsjelmer_: That's odd, doesn't seem to do it if you've installed instead of running from build folder11:39
LarstiQjohnf1: I think I'm happy. Shall I copy over bzr-svn now?11:48
johnf1LarstiQ: ye please and bzr and bzrtools as well11:49
LarstiQjohnf1: will do11:49
johnf1thanks11:49
=== johnf1 is now known as johnf
LarstiQjohnf: aand they're published11:56
poolienight all12:10
LarstiQnight poolie12:14
LarstiQjelmer_: can you approve me for ~subvertpy?12:17
LenzGrSo I wanted to test the Bzr Explorer, but it fails with the following message:12:45
LenzGr$  bzr explorer12:45
LenzGrbzr: ERROR: No module named lib.util12:45
LenzGrYou may need to install this Python library separately.12:45
LenzGrHas anyone seen this?12:45
LenzGrI can't find said python lib...12:45
=== mrevell is now known as mrevell-lunch
LarstiQLenzGr: how did you install Bzr Explorer?12:51
LenzGrLarstiQ: I branched the lp project into my plugin dir, as stated in the instructions12:51
LarstiQLenzGr: k12:52
* LarstiQ tries the same12:52
* LenzGr uses openSUSE 11.0, FWIW...12:52
LarstiQLenzGr: works for me, on Debian Lenny12:53
LenzGrLarstiQ: OK, I guess I will submit a bug report then :)12:53
LenzGrOh wait...12:53
LenzGrI guess my version bzr-qt is too old.12:53
LenzGr0.8...12:54
LenzGrNever mind...12:54
* LenzGr tries to update12:54
vilaLenzGr: if updating solve your problem, file a bug anyway, bzr explorer should checks its dependencies12:56
LenzGrvila: Can do. Agreed, the error message could be a bit more helpful12:57
=== AnMaster_ is now known as AnMaster
=== Kissaki^0ff is now known as Kissaki
AfC$ bzr help revisionspec14:21
AfCbzr: ERROR: No module named subvertpy14:21
AfCYou may need to install this Python library separately.14:21
AfChuh?14:21
verterokAfC: bzr-svn requires subvertpy14:26
verterokhi! :)14:26
AfCverterok: which is what? [any idea why this would have broken now whereas it was working silently for ages]14:27
verterokAfC: did you updated bzr-svn?14:27
AfCverterok: [and, hi! back Guillermo :)]14:27
AfCverterok: yea14:28
verterokAfC: installing the dependency should fix it :)14:28
* AfC wonders what the dependency is. There's no *subvert* package on my system14:31
johnfAfc: you using the ppa?14:36
AfCjohnf: no14:37
verterokAfC: https://edge.launchpad.net/subvertpy14:37
AfC"Alternative Python bindings for Subversion"? Never heard of it14:37
verterokAfC: and if you'r using Ubuntu adding the ~bzr ppa should be enough: https://edge.launchpad.net/~bzr/+archive/ppa14:38
AfCverterok: no, not using Ubuntu. Stopped using Debian 7 years ago. Never looked back.14:38
verterokAfC: don't know if it's packaged for your distro :/14:39
verterokAfC: bzr branch lp:subverty; and install it from source ;)14:39
AfCDoes anyone know if there's a way to tell bzr-svn to use whatever it used to use?14:39
AfCverterok: ok. Is it a bzr plugin, or am I going to have to jump through hoops to try and install it somewhere?14:40
verterokAfC: I think subvertpy was part of bzr-svn14:40
AfCOh shit14:40
verterokAfC: what distro are you using?14:40
AfCverterok: Gentoo on systems I control, RHEL on systems I don't.14:42
AfCverterok: (and some Solaris, unfortunately)14:42
verterokAfC: for  Gentoo it should be quite easy to create an ebuild....for the RHEL and Solaris...I don't know :(14:43
AfCverterok: of course14:43
AfCJust the usual "oh, joy, another dependency that doesn't already exist"14:43
AfCwe went through this already once with Subversion needing to be build by hand. :|14:44
verterokAfC: subvertpy avoid requiring a patched subversion :)14:45
AfC"great"14:45
verterokbut you need subvertpy :)14:46
AfC"great"14:46
monkey_d_luffyI accidentily deleted (through a bad makefile) a directory in my project. I would like to restore it from bzr. But from what I can see, I can only "export" a whole branch.  How can I do this?14:46
AfCmonkey_d_luffy: does14:46
AfC$ bzr status14:46
AfCmonkey_d_luffy: show it as removed?14:46
AfCverterok: [Any idea how to tell bzr-svn to use the subverty checkout I just built?]14:48
monkey_d_luffyAfC: yes, the whole dir contents is shown as removed.  How can I restore this specific directory (and files and subdirs)?14:48
AfCmonkey_d_luffy: then14:48
verterokAfC: move the build into the bzr-svn checkout? :)14:49
AfC$ bzr revert path/to/directory14:49
verterokAfC: or include it in the PYTHONPATH of bzr14:49
AfCmonkey_d_luffy: should restore it14:49
AfCmove it into... um14:49
monkey_d_luffyAfC: thanks14:51
AfCmonkey_d_luffy: (if you ever *really* get backed into a corner, you can always just branch another branch14:51
AfC(hm)14:51
AfCwith say14:51
AfC$ cd ..14:51
AfC$ bzr branch bad/ good/14:51
AfC$ mv good/missing/ bad/14:51
AfC(sic)14:51
AfCor something to that effect)14:52
AfCmonkey_d_luffy: you've got full history, so you can always get back14:52
=== mario__ is now known as pygi
monkey_d_luffyAfC: full history as long as I have commited :p          I did loose a bit of information, but not much I think.   This scared me.  If the remove was a dir up... I would have lost everything... also ".bzr"14:57
monkey_d_luffyI think it's time to backup to read-only media14:58
AfCmonkey_d_luffy: nothing so drastic needed ... but this is why it's a good idea to push your work elsewhere from time to time14:59
AfC[even internal work-in-progress branches we tend to push up to our public server; not so much for anyone else to see, but it is another defence against what you describe - and tends to be fresher (since easier) that proper backups (which we also do!)]15:01
Sheepherdyou here lifeless?15:04
tedglifeless: Added a script to bug 390490 to recreate it.  I now know how to make the revno's backwards :)15:10
ubottuLaunchpad bug 390490 in bzr "Revno reset to 1, others now negative" [Undecided,New] https://launchpad.net/bugs/39049015:10
vadi2For a patch made with bzr diff, how can it be applied?15:14
Takpatch < blah.diff15:18
Sheepherdjust reading "bazaar in five minutes" and im about to "publishing your branch with launchpad"15:19
vadi2And for windows? the said contributor has an odd setup of a gprs modem in a vm because it doesn't work on linux15:19
Takcygwin + patch < blah.diff? ;-P15:19
vadi2heh15:19
Sheepherdset up my account properly and now the tutorial says: "$ bzr push bzr+ssh://john.doe@bazaar.launchpad.net/~john.doe/+junk/myproject" replacing john.doe with you own launchpad username15:19
TakI dunno, tortoise might have some util for applying a patch15:19
Sheepherdi put Sheepherd @ both places but it doesnt work15:20
Sheepherdreturns the errow: "Unable to loop up default port for ssh15:21
Sheepherderror*15:21
Sheepherdsomeone knows why this happens to me? win xp 32bit sp315:22
vadi2Firewall?15:23
Sheepherdi allowed the app15:23
Sheepherdbut wait a mom... gonna check if thats the prob15:23
Sheepherdnope... doesnt work without firewall15:24
Takspecify the port in the url?15:26
Sheepherdhow?15:27
Takbazaar.launchpad.net:2215:28
Sheepherdk thx gonna try after a reboot15:29
AshtonKemHey, quick question. I have my own branch on launchpad. But after I did a merge from trunk, it turns out that trunk is broken. How would I revert one revision back from trunk, but not my branch?15:30
vilajam: ping15:35
jamhi vila15:42
vilajam: I just wanted to clarify the naming rules for pyrex/python modules as there seem to be several right now15:47
vila_py.py for python _pyx.py for pyrex right15:48
jamvila: it changed over time15:48
jam_pyx.pyx actually15:48
jam:)15:48
vilayes :)15:48
jambut yeah, Robert said he prefers that15:48
jamand I don't really care15:48
vilaOk, so it allows to use the same method names in both implementations15:49
vilaI'm updating _dirstate_helpers to that scheme and aligning all other module names (the final aim is to be able so safely predict the generated C file name when pyrex is not available)15:50
vilaI also like to call them pyrex methods/modules instead of C methods/modules to make it clearer if one day we have a third pure-C implementation for one module15:51
vilaIn fact, that already works for patience diff15:52
vilajam: no objections ^ ?15:59
vadi2Is it planned to fix bzr-gtk anytime soon?15:59
jamvila: no objections16:01
* SamB wonders why his completions for "bzr" are so lame right now -- it doesn't complete directories in "bzr co --lightweight", for instance!16:05
* SamB is using zsh16:05
Sheepherdwhen i try to publish my branch with launchpad i get this error: http://pastebin.com/da8a7a5b16:09
Sheepherdwhy is that so?16:09
TakSheepherd: are you using the keyset that you set up with launchpad?16:10
SheepherdTak: whats that?16:11
Sheepherdnvm found the issue16:11
Sheepherdforgot one slash somewhere in the command :/16:12
LCIDFireHi. Could someone give me a hint how to get a bzr branch imported into git16:12
awilkinsLCIDFire: Bidirectionally or once?16:14
LCIDFireawilkins: Every once in a while - but just pulling16:14
awilkinsLCIDFire: Well, I'm not sure if bzr-fast-import works incrementally16:16
awilkinsLCIDFire: But that's maybe a good place to start. And there's a bzr-git plugin too.16:16
LCIDFireawilkins: But it seems to me that they are the other way around16:16
awilkinsLCIDFire: bzr-fast-import is based on git-fast-import, so the output of the frontend for bzr should be compatible with git (?)16:17
awilkinsLCIDFire: I've not used bzr-git but if it's like bzr-svn it should support push16:18
LCIDFireawilkins: I'd just submit patches instead of pushing16:18
lamalexI ran bzr shelve --all and got this 'bzr: ERROR: Tree transform is malformed [('missing parent', 'new-16'), ('missing parent', 'new-1')]'16:26
lamalexanyone know why?16:26
dashwoah16:26
dashno, but I sure would like to16:26
lamalexheh me too16:27
LCIDFireawilkins: do you know whether piping works?16:28
awilkinsLCIDFire: piping from what to what?16:31
awilkinsLCIDFire: fast-export | fast-import  ?16:31
LCIDFireawilkins: from bzr fe to git fi16:32
awilkinsLCIDFire: It should work, if it's going to work16:32
LCIDFireawilkins: at least it does not complain too much - we'll see what it does16:32
LCIDFireawilkins: what is a checkpoint in bzr language?16:33
awilkinstag?16:33
awilkinsI'm not sure what a checkpoint in git is though16:33
LCIDFireit's over 1000 commits16:34
awilkinsLCIDFire: Ah, that would be a pack boundary, I suppose16:34
awilkinsLCIDFire: It auto-repacks at intervals16:35
LCIDFireawilkins: could be16:35
awilkinslamalex: shelve was changed to use the same operations as the VCS does, but I'm not sure for the specific reason for your error, but it might be that you have a file in a folder that hasn't been added??16:37
awilkinslamalex: Looks like a bug anyway16:37
LCIDFireat 2000 commits16:37
lamalexawilkins: i have many files in my folder that haven't been added16:40
lamalexthat shouldnt matter though.. if it does- definitely a bug16:41
LCIDFireawilkins: it's done - and seems pretty good - thanks a lot16:41
awilkinsLCIDFire: Excellent.. does it seem to have an "incremental" feature?16:44
LCIDFireawilkins: it does not "seem" - but it might be smart enough (hopefully)16:45
LCIDFireawilkins: even if it is - it will probably still need a complete export of the branch - which is not a nice thing to do :(16:47
awilkinshttp://www.fthieme.net/drupal6/node/7716:48
awilkinsApparentlt it does support it16:48
awilkinsRight, hometime16:49
LCIDFireawilkins: I seem to overlook the phrase where it states it...16:51
jelmer_LarstiQ: yeah, one sec17:34
=== mrevell-lunch is now known as mrevell
=== mthaddon is now known as afk
SamBhmm ... is it possible for bzr diff to show context information like git diff does?18:56
SamBI mean, after the @@ .. @@ line?18:57
SamB(well, at the end, actually)18:57
SamBfor example:18:58
SamB--- a/arch/x86/kernel/signal.c18:58
SamB+++ b/arch/x86/kernel/signal.c18:58
SamB@@ -340,6 +340,8 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,18:58
shane_faganHey im trying to push to launchpad but bzr keeps telling me no revisions to pull19:20
shane_faganOr push ha19:20
garyvdmshane_fagan: what makes you think that there are revisions that have not been pushed?19:27
shane_faganIt isnt showing up on launchpad19:27
shane_faganand I pushed it about 20 minutes ago19:27
garyvdmtry running bzr log -l 1 lp:{your branch]19:29
garyvdmThat will confirm if you have pushed, and the launchpad ui has not updated it's cache19:30
garyvdmWhich is what I suspect.19:30
shane_faganno output19:30
shane_faganstrange19:30
garyvdmPlease pastebin terminal.19:31
garyvdmbrb19:32
shane_faganthere is nothing to pastebin19:32
garyvdmOk - what is you branch on launchpad?19:33
shane_faganIll try again just give me a sec19:33
shane_faganHmm still didnt work lp:~shanepatrickfagan/+junk/zeitgeist_empathy19:35
garyvdmand if you do "bzr log -l 1" in the directory that you are pushing from?19:36
shane_faganshane@shane-laptop:~/zeitgeist_empathy19:37
garyvdmlp:~shanepatrickfagan/+junk/zeitgeist_empathy is empty19:37
garyvdmNo revisions19:37
shane_faganyep thats the problem I tried pushing to it but it says no revisions to push19:37
garyvdmWhat happens if you do just bzr log -l 1"19:38
garyvdmbzr log -l 119:38
shane_fagannothing19:39
garyvdmSo your local branch is the same as the launchpad branch - so push is working fine.19:39
garyvdmBoth your branches are empty.19:39
garyvdmHave you done bzr commit?19:40
shane_faganI have 1 file in the one on my computer19:40
shane_faganYes but I havent on this branch19:40
garyvdmYou need to do bzr add19:40
garyvdmthen bzr commit19:40
garyvdmthen bzr push19:40
shane_faganOk that must be my problem19:41
shane_faganbzr: ERROR: Path(s) are not versioned: "lp:~shanepatrickfagan/+junk/zeitgeist_empathy"19:42
garyvdmWhat did you try?19:43
shane_faganbzr commit lp:~shanepatrickfagan/+junk/zeitgeist_empathy19:43
garyvdmNo - you first need to commit locally, and then push to launchpad.19:44
garyvdmSo just bzr commit -m "your message"19:44
shane_faganAh there I feel really stupid19:45
garyvdmDon't worry.19:47
shane_faganThanks for the help19:47
abentleySamB: To do that, supply --diff-options="-p"20:40
SamBabentley: is there a configuration option for that?20:40
ddaaI have a very strange problem here that seems to be related to bzr in a weird and indirect way.20:40
ddaaI run an apache server, with Trac and ReviewBoard on mod_python.20:41
ddaaBoth of them interfacing with bzr.20:41
abentleySamB: All commands can be configured with aliases, e.g. bzr alias "diff=diff diff --diff-options=-p"20:41
ddaaAnd if I run them both in different subinterpreters, then the ElementTree monkeypatching fails the second time it runs.20:42
ddaaWith AttributError, no ElementTree in module.20:42
ddaaIf I run them both in the same subinterpreter, it works.20:42
ddaa(actually, the test was with one in main_interpreter, and one in a sub-interpr, but I doubt it makes any difference).20:42
ddaaDoes it makes sense to anyone here?20:43
SamBabentley: ah20:44
abentleyddaa: No, not something I've heard of.20:44
beunojam, hi21:33
beunoare around?21:33
jamhi beuno21:33
beunojam, got a sec to help me figure out a bbc bug?21:34
beuno(or what I think is a bbc bug)21:34
beunohttps://pastebin.canonical.com/18839/21:34
beunothis is a new 2a branch created today21:34
beunoI suspect stacking bugs: the return of the undead21:35
jamstacked or not?21:35
beunostacked21:35
beunowith 1.1621:36
beuno1.16rc1 on the other end (LP)21:36
jambeuno: do you get the same error if you just try to do "bzr branch lp:..." ?21:37
* beuno tries21:38
beunojam, not into a shared repo with all the revisions already present21:38
beunonot sure how to test it without the revisions present21:38
beuno(as it's my branch, etc)21:39
beunobut someone else tried it, and it did fail21:39
jamso does merge still fail "in a shared repo with all the revisions present"?21:39
beunocprov, ping?21:39
cprovbeuno: yo21:39
cprovbeuno: I don't know anything about bzr :)21:39
beunocprov, did you get the error with my branch on merge, or on branch?21:39
cprovbeuno: ah, yes, one merge or pull, it seems to be a problem in the smartserver.21:40
beunojam, seems so, but this is new to 2a, because we've been error-less since ~1.14rc1 or so21:40
jambeuno, cprov: to test this out locally, you can "bzr branch myrepo/devel testrepo"21:40
cprovbeuno: https://pastebin.canonical.com/18844/21:40
beunoah21:41
beunojam, so on pull it breaks as well21:41
jamand then cprov oddly enough that is a different traceback than https://pastebin.canonical.com/18839/21:41
jamnot that it really matters21:41
jamI have some thoughts21:41
jambut I'll try to check it here21:41
beunothanks21:41
beunoit's release week21:41
beunoand I need to get that branch landed somehow  :)21:41
jamhave to wait for it to download21:41
jambeuno: I'm not sure if I'll have access to your branch21:42
beunojam, I think you should, but I'll subscribe you anyway21:42
jambeuno, cprov: just to be sure, can you access it via sftp?21:59
jam(you should be able to, and that is the current workaround)21:59
cprovjam: I can try, one sec21:59
beunojam, even if we could, EC2 can't21:59
cprovjam: it seems to work over sftp22:01
cprovjam what's the 'nosmart' trick for bzr+ssh ?22:01
lifelessmoin22:01
beunocprov, lp+nosmart://...22:02
beunohiya lifeless22:02
=== nevans1 is now known as nevans
lifelessjam: before you go, reviewing the patch I copied you on is really important to me ;)22:04
=== fta_ is now known as fta
cprovjam: after the successful merge with sftp, bzr+ssh works as well22:09
lifelessjam: ah, found the review from you - thanks.22:13
beunocprov, jam, it seems that once the revisions are in the shared repo, all is fine22:13
beunosmells exactly like the 1.13 stacking bug22:14
lifelessI think it is22:14
lifelesswhich is, that the delta being created on the server is too big22:14
beunolifeless, and why did it come back in 2a?22:15
lifelessdon't know yet22:15
lifelessthere are two possibilities22:15
lifelessa) the code that chooses what to push/request, to ensure that good deltas can be made, is broken.22:16
lifelessb) the code that makes good deltas, is broken22:16
lifelessc) Something I haven't thought of.22:16
beunook, progress22:16
beunonow22:16
beuno1) do you want me to file a bug?22:16
lifelessno22:16
lifelessits already filed22:16
beuno2) how can I get passed this, and land my branch, as it's the last day to land fixes on Launchpad?22:17
lifelessuse sftp22:17
beunoI can't22:17
lifelessor nosmart+22:17
beunoit needs to go through EC222:17
beunoand EC2 uses lp:22:17
lifelessteach EC2 to use sftp or nosmart22:17
beunore-building the EC2 image will take...  4 or 5 hours22:17
lifelessDowngrade your branch to 1.9-rich-root22:18
lifelesswhich will take longer :P22:18
beunoI have about 2 hours to land this22:18
lifelessland it by hand22:18
beunohow?  it needs to be in LP, and whenever it's pushed to LP it breaks22:19
lifelessthat last bit didn't parse22:19
beunohow can I land this branch, if it breaks when it's pushed to Launchpad?22:20
cprovbeuno: it doesn't help if you reapply the diff in a fresh branch ?22:20
cprovprobably not, ignore me.22:20
beunocprov, maybe, I don't know what will fix it at this point22:21
beunomaybe not stacking it22:21
beunobut it will take hours to push it as well22:22
cprovbeuno: branch lp:~cprov/launchpad/beuno22:23
beunocprov, thanks. I'll get someone who doesn't have the revs to branch it22:24
cprovbeuno: I didn't merge you branch successfully in my local repo, it was in dogfood. I've reapplied your diff in a fresh branch in my machine.22:26
beunocprov, the problem is that you will have stacked the branch, so it may contain the same error22:26
lifelessbeuno: get a LOSA to push your branches revisions to whatever branch you stack on22:27
cprovbeuno: right22:27
beunolifeless, of course, all LOSAs are sprinting in London and sleeping by now  :)22:27
beunofantastic day, as you can see22:27
lifelessyes22:27
beunolifeless, I'll try and figure this out, maybe using chinstrap for speed. But, can you please make sure this is treated as critical?  it will bring the Launchpad team to a stop22:28
lifelessbeuno: it is22:29
beunolifeless, thank you22:29
lifelessbeuno: however you will /need/ to fix EC2 in the short term22:30
beunolifeless, yes, I will make sure everyone is aware22:30
lifelessbecause that can be done without blocking on server side changes which this needs22:30
beunoyeah, we can tackle it on all fronts22:31
lifelessjam: ping? or are you gone already?22:31
abentleybeuno: You don't *need* to run the test on EC2.  You can run them locally.22:57
beunoabentley, yes, I can stop working for 5 hours while tests run22:58
beunoalso, PQM will fall over as well22:58
abentleybeuno: Sorry, I thought that that this was a critically-important branch.22:59
beunoabentley, it is. But tests locally take longer than EC2 (5hs vs 2.5)23:00
abentleylifeless: couldn't this be that issue where stacking is too aggressive, so it doesn't with the smart server, just dumb clients?23:01
lifelessabentley: I think its the same cause, but the details will be different for CHK23:07
lifeless07:16 < lifeless> a) the code that chooses what to push/request, to ensure that good deltas can be made, is broken.23:08
lifeless07:16 < lifeless> b) the code that makes good deltas, is broken23:08
lifeless07:16 < lifeless> c) Something I haven't thought of.23:08
jambeuno: btw, I can't see your branch23:11
jamI assume you never got me subscribed23:11
jamlifeless: I'm here, but I'm just about to head out the door23:11
lifelessjam: do you agree with my analysis - have you done more analysis on this yourself?23:11
jamlifeless: I just managed to download launchpad itself23:12
jamI was going to poke at it, but haven't got there23:12
lifelessjam: you don't need lp; there are bzr branches suffering23:12
jamand yes, it is either a, b, or c :)23:12
lifelessdo you have a hunch, given you touched this area for chk most recently?23:12
jamlifeless: so unfortunately this is happening on the *server* and we don't get the server traceback23:13
jamso I'm not sure where it is happening23:13
jamit certainly looks like the "iter_interesting_nodes" is thinking different things locally than it does on the server23:13
jamotherwise, it should have found that text to be missing, and have requested it be filled in23:13
lifelessbug 39056323:15
ubottuLaunchpad bug 390563 in bzr "absent factory exception from smart server when merging or branching" [Critical,Confirmed] https://launchpad.net/bugs/39056323:15
lifelessjam: ^23:15
lifelessbzr branch lp:~mbp/bzr/progress progress23:16
lifelessis suffering apparently23:16
jamlifeless: so that would indicate it isn't a bbc thing23:17
beunojam, re-pushed23:17
lifelessoh right yes23:17
lifelessman, my thinking cap was not working at all :)23:17
jamAre we sure Martin's 'progress' branch wasn't originally pushed with a "broken client" ?23:18
lifelessjam: not entirely23:19
lifelessI'll get him to run the fixer23:19
jamSo... we can be quite sure of it for the LP branches, since they wouldn't have pushed up a --2a without it :)23:19
lifelessindeed23:19
jambut i'll play around with it a few different ways23:19
jamUnless you take care of it tonight23:20
jamI need to go pick up my son23:20
jamI might check back in later tonight23:20
lifelesskk23:20
jambeuno: I still get "bzr: ERROR: Not a branch: "bzr+ssh:/...~beuno/launchpad/sprites-more-fixes/"23:20
jamI'm not on the Launchpad team23:20
jamI can only see the trunk because jml subscribed me23:21
beunojam, you are subscribed23:23
beunocan you go to: https://code.edge.launchpad.net/~beuno/launchpad/sprites-more-fixes23:23
jambeuno: nope23:23
jam:(23:24
beunoreally?23:24
beunoargh23:24
beunoyou show up on the subscribers list...23:24
beunojml, can you help?23:24
beunojam, are you logged in?23:24
beunoon edge23:24
jambeuno: yep23:24
jamyep23:24
jmlbeuno, what's the problem?23:24
beuno~jameinel is subscribed23:24
beunojml, jam's subscribed to a branch23:25
beunoand he still can't access it23:25
jamlifeless: my simple direct tests with a --2a conversion of bzr.dev and about 500 extra revisions in a stacked location does *not* reproduce this23:27
jamso we'll need to try something else23:27
jamlifeless: I'll be back later23:27
beunolifeless, FYI, branching trunk locally, and merging the sprites branch into it, and pushing, doesn't trigger this problem23:28
beunono idea why23:28
beunobut it doesn't23:28
jmlbeuno, jam needs to be subscribed to db-devel also.23:28
beunojml, smells like a UI bug23:29
beuno(thanks(23:29
jmlbeuno, it's a very complicated one that I'd be glad to discuss with you & fix when we both have the time to do so :)23:29
beunojam, try again when you're back23:29
beunojml, :)23:29
jmlafter packing, can I delete obsolete packs?23:34
jmlsafely, that is.23:34
beunojml, make sure the branch still works (bzr log?) and yes23:37
beunoI do that routinely on the office branches23:37
lifelessjml:  you can remove the contents of obsolete_packs/, not the dir itself23:56
lifelessjml: but you should 'sync' first23:56

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