/srv/irclogs.ubuntu.com/2008/09/19/#bzr.txt

poolieOdd_Bloke: i'll look for your mail and reply then00:00
Odd_Blokepoolie: Sure, just grabbing your key to encrypt it now.00:01
Odd_BlokeGPG - fun for all the family.00:01
GaryvdMHi - How can I revert changes made by a revision in my wt?00:02
GaryvdMNot revert to a revision00:02
poolieundo just some of the changes?00:02
GaryvdMUndo the changes by a revisions, but the the changes by subsequent revisions00:03
GaryvdM*Undo the changes by a revision00:03
poolietry something like 'bzr merge -r 10..9'00:03
GaryvdMok00:03
GaryvdMThanks poolie - That worked.00:05
Odd_Blokepoolie: Sent.00:05
bpierre_well, that little conversation about switch was a real eye opener, I can't beleive I skipped this section in the manual... thanks for your answers00:09
bpierre_bye00:09
markhjam: any hope still of getting the plugin localizations included with 1.7?00:25
=== BasicPRO is now known as BasicOSX
poolieabentley, bb seems to be down...00:30
abentleypoolie: restarted00:30
pooliethanks very much00:30
GaryvdMping lifeless00:31
jammarkh: I suppose I could force it. Though it would be nice if we could get poolie or spiv to review it and also approve.00:32
jamIt is small enough that I would be okay with bringing it in post rc200:32
GaryvdMjam: could you give me any pointers to try figure out why get_parent_map is slower when passing all revisions in one go?00:35
lifelessGaryvdM: hmm?00:36
lifelesscall to all devs: please give my readdir branch a spin00:36
GaryvdMlifeless: same question as jam :-)00:37
lifelessGaryvdM: lsprof00:37
GaryvdMok00:37
lifelessalso try a btree based repo and see if that handles it more gracefully00:38
pooliejam, i'll try to look00:38
GaryvdMok00:39
GaryvdMlifeless: Sorry - how do I create a btree based repo?  None of the formats in "bzr help init" mention btree?00:51
markhlifeless: recall how you suggested I set sys.platform to "win32" so linux can run the same tests?  The problem is that osutils, and probably others, do win32 specific things at *import* time - eg, osutils.abspath is set to a linux or windows specific version as osutils is imported.  Thus, as Ian noticed, the tests fail on Linux.  What do you suggest?00:59
lifelessmarkh: oh01:07
lifelessmarkh: bummer :P, I guess, disable it then01:07
markhok cool01:08
lifelessGaryvdM: the index2 plugin has the code, though its a little bitrotted;01:08
jelmermarkh: hi!01:08
markhjelmer: hi!01:08
markhjelmer: you get a build related patch from me?  I *think* I remembered to send one...01:08
jelmermarkh: No, what was it about?01:09
jelmermarkh: bzr-svn on Windows? (-:01:09
markhbummer.  libsasl.dll needs to be included for 1.501:09
markhsvn 1.501:09
* markh looks01:09
jelmermarkh: what address did you send it to?01:09
markhjelmer at samba.org, sent tuesday01:10
markhtry again to that addy?01:10
igchi all01:11
markhg'day ian!01:11
igcmarkh: hi01:11
igcmarkh: re your win32utils patch, it needs a tweak too01:11
markhigc: thanks for the review of that patch - but that lifeless character led me astray ;)01:11
beunohi igc!01:11
igchi beuno01:11
markhigc: you referring to the transport abspath patch?01:12
lifelessmarkh: well the altered code path should be testable; its a nuisance that its not01:12
markhlifeless: yeah, I understand and agree with your motivations01:12
igcso markh, TestlocationCtypes needs some more protection as it runs (and fails) on Linux01:12
igcthe os.environ["APPDATA"] bit causes a KeyError01:12
jelmermarkh: let me just check whether I didn't accidently skip over it01:13
jelmermarkh: nope - please resend01:13
igcmarkh: get_local_appdata_location() patch01:13
jelmer'morning Ian!01:14
igchi jelmer. How are you?01:14
markhigc: right, bummer.  I must remember that my test ubuntu installation is only a couple of clicks away...01:14
igc:-)01:14
markhI'll quickly fix the transport abspath to simply disable the tests on windows first01:14
markhjelmer: sent01:15
jelmermarkh: also, I was wondering if you could run the testsuite against my IPv6 patch on windows.01:16
markhjelmer: why not :)  where is it?01:16
jelmerhttp://bundlebuggy.aaronbentley.com/project/bzr/request/%3C20080830185330.GA22976%40vernstok.nl%3E01:16
jelmerigc: Good, thanks!01:17
jelmerigc: How are you? It's good to see you around here again.01:17
markhjelmer: is there a nice subset of tests I can run to reduce the noise caused by the full suite?01:17
jelmermarkh: Just the smart server tests should be sufficient01:18
igcjelmer: I'm better thanks.01:19
markhjelmer: socket module has no attribute AI_ADDRCONFIG on windows :(01:21
jelmermarkh: does it work ok if you exclude AI_ADDRCONFIG?01:22
markhjelmer: "smart.*server" runs 27 tests and they all pass now.  How to remove that flag from server.py and medium.py01:24
markhs/How/Had/01:24
jelmermarkh: Cool, thanks.01:25
markhjust "selftest server" runs 42 and they all pass too :)01:26
=== abadger19991 is now known as abadger1999
markhigc: I resubmitted the transport_abspath patch which skips the test on non-windows.01:37
igcmarkh: thanks01:38
=== mwh is now known as mwhudson
GaryvdMHi lifeless. I unfortunately get the following error: http://pastebin.com/d78fe14ad01:42
GaryvdMI attached a debugger, and format_registry.register_metadir is being called twice01:42
lifelessinteresting01:43
lifelessis the plugin loading correctly?01:43
GaryvdMno01:43
lifelesswell, thats probably the cause of the double-registration01:44
GaryvdMIt seems that that error is being thrown when the plugin is loading01:44
lifelessI'll see if I can peek later today, but trying with bzr 1.6 might let it load properly01:44
GaryvdMok01:44
lifelessno, that error is during arg processing01:45
=== cjwatson_ is now known as cjwatson
lifelessoh cool - http://www.datadictionary.nhs.uk/  uses bzr01:47
lifelessawilkins: do you know more about them ?01:47
mwhudsonblink01:48
GaryvdMlifeless: It's because I don't have pybloom installed :-)01:48
lifelessif you hack the plugin up a bit01:49
lifelessyou can use the btree implementation in bzr.dev01:49
lifeless(rather than the one in the plugins btree_index module01:50
jelmerlifeless: from what I understand, awilkins works for NHS :-)01:52
lifelessjelmer: ah01:52
markhigc: thanks for the review, and I should try to proof-read better :(  I'm still confused by the 'tweak' thing though - who will/should fix that typo in the comments?01:54
igcmarkh: I will when I merge it to pqm01:55
lifelessmarkh: tweak technically means 'ok to merge with no more review but the changes done'01:55
markhlifeless: yeah - but sometimes I'm not sure if I'm being asked to make the tweak and resubmit, or someone else will...01:56
lifelessmarkh: if you don't have merge access, then I'd say you still should make the changes yourself, but you could just ping someone on IRC to land it (or send it in again with a note saying 'all reviewed this is the tweaks')01:56
markhespecially as the person saying 'tweak' might not be the person submitting it to PQM IIUC01:56
lifelessright01:56
igcmarkh: we do overload tweak to mean two things ...01:57
markhlifeless: yeah, I don't have merge access, so I think I'll assume I should resubmit with the tweaks unless I can convince a sucker to tweak and land for me :)01:57
igc1) another review not required01:57
igc2) small changes needed before merging01:57
lifelessigc: I don't see that as overloading :). We have could represent it as multiple bits in a bitfield, but symbolic names are easier :P01:58
igcmarkh: if I ever vote tweak but ask you to do the tweaks, it's my polite way of saying you can probably tweak it better than I can01:59
igcmarkh: in the case of fixing a comment, I'm sure I have the intellect to manage that myself :-)02:00
igclifeless: if you're ok with markh's resubmitted patch, I'll tweak and land it02:01
mwhudsonjam: yay for figuring out https://bugs.edge.launchpad.net/bzr/+bug/24251002:02
ubottuUbuntu bug 242510 in bzr "Pack already exists when pushing/autopacking" [High,Confirmed]02:02
markhso now all we need is a story for the LockContention failure noise on Windows and the test suite there will be looking good!02:03
lifelessigc: poolie has acked I think02:03
lifelessmarkh: if I vote tweak, I expect the author to tweak02:03
markhigc: good to see you back again :)  How are things?02:03
lifelessmarkh: which FWIW is the safe default for you to assume :P02:04
markhlifeless: so I hope you understand my slight confusion ;)02:04
lifelessmarkh: I think its due to igc being helpful02:04
igcmarkh: I'm better today. Still some pain but nothing like before02:04
markhdamn helpful people!02:04
markhigc: good.  the treatment getting easier?02:05
igcmarkh: treatment stopped for now; surgery in early Oct is next; recovery before then02:05
pooliehello igc02:07
igchi poolie!02:07
markhjelmer: that mail arrive?02:09
jelmeryep, thanks02:17
jelmermarkh: I've merged it02:17
markhjam: that patch for the plugin l10n files has actually got 2 approve votes already.02:28
markh1.7rc2 binaries for windows are now up on launchpad03:15
markhAlso FYI, http://bazaar-vcs.org/TortoiseBzr has some recent Tortoise screen-shots from Vista and is looking quite pretty :)03:18
thumpermarkh: OMG, the UI refers to creating a stacked branch03:26
thumpermarkh: I do question the (possible) default of making a checkout03:27
markhthumper: is the stacked branch thing good or bad? :)03:27
thumpermarkh: is the revno really 0.0.1dev?03:27
thumpermarkh: surely we could have a bigger number :)03:27
markhyep :)  Probably should be 0.0.2.dev now ;)03:27
thumpermarkh: kinda good03:27
thumpermarkh: but more to explain to the users :)03:28
thumpermarkh: looks very pretty though03:28
thumpermarkh: good work03:28
markhthanks!03:28
thumperblog now please :)03:28
markhlots of the prettiness is qbzr03:28
* markh needs to get one of those new-fangled blog thingies...03:29
GaryvdMNice markh!03:29
markhI just recently landed a nice change so we can easily have those 'links' on the form display a popup help window with any bzr topic formatted as reasonable html, which is nice.  All 'revision number' boxes can have a link that explain the revision number formats, for example.03:31
markhack - but I just noticed the binaries don't have docutils so things aren't as pretty as they could be :(03:33
GaryvdMmarkh - just want to nudge you to Bug #27198303:34
ubottuLaunchpad bug 271983 in qbzr "Error writen to concole when clicking on "branches" link in qinit" [Undecided,New] https://launchpad.net/bugs/27198303:34
markhGaryvdM: ack - I must have missed that.  Do you have any idea what it does mean?  I'm guessing localizations?03:36
markhWFM obviously03:36
GaryvdMI was hoping it was something you missed. I'll debug.03:37
* markh just twigges GaryvdM is qbzr's Gary - hi!03:37
markhtwigged03:37
GaryvdMHi!03:37
markhGaryvdM: what do you think in principle of those large changed I recently mailed about?03:38
GaryvdMI haven't got my head around them yet :-(03:39
GaryvdMI did pull the branch and gave it a test run - And I could not see any problems :-)03:40
markhfair enough :)  I think being able to use the signal/slot editor is a nice feature, as is the abaility to have the form at runtime look much more likje it does in qtdesigner.  I'm happy to negotiate the actual impl obviously though :)03:40
markhits very nice to have a checkbox connected to a radio button, so magically the checkbox is only enabled when the radio is - all with zero code :)03:41
GaryvdMOh - Thats cool03:41
markhsimilarly with links - you could add a new help link to any of our forms with zero code.03:42
markhjust connect the signal with the slot in the editor03:42
markhI'm quite impressed with qt03:42
GaryvdMThat bug is weird. I get it when I run from the command line, but not when I run from Komodo03:43
markhthe code I copied from blindly indexed via 'foo[0][1]' - ie, had no regard for the fact there might be more than 1.  So that's probably a good option :)  I'll have a look after I eat...03:45
GaryvdMIt's get 2 help topics because I have the bzrtools plugin installed, which has a command called branches.03:52
markhhrm - I have bzrtools 1.7.0 installed too04:06
GaryvdMI think we can safely just display the first topic.04:07
markhsounds fine to me04:07
GaryvdMOk I'm pushing a fix now.04:07
markhthanks04:08
* igc unch04:20
stefanlsdI am playing around with bzr and the merging, and when i merge it gives me a file.moved. How do i get the launchpad / ubuntu functionality where it generated the conflict markers in the same file?05:52
RAOFstefanlsd: It's my understanding that what you're seeing happens when you've independently added the same file in different branches, and so bzr doesn't know that they're the same file.05:53
stefanlsdRAOF: yeah, i did that.  let me try and modify the contents of the same file after i've merged then...05:56
spivstefanlsd: RAOF is right.  You get foo.moved files when it's a conflict of two different files at the same path.  You get conflict markers within a file when there's a conflict of the contents of one file.05:56
stefanlsdRAOF, spiv:  thanks, yeah. i see that now.05:58
vilahi all07:02
=== BasicPRO is now known as BasicOSX
=== Peng__ is now known as Peng
* vila off to renew passport08:24
ngnphi ... is there document about combining cvs and bazaar ... my project is in cvs ... doing a cvs 'switch-branch' my .bzr was deleted08:46
ngnpdo I need a shared repo to prevent this or are there other ways.08:46
* vila 's back08:53
matkorHi ! I upgraded bzr 1.5 -> 1.6.1, during bzr update bzr suggested doing upgrade I did , now I during bzr update I get: bzr: ERROR: The branch format Bazaar-NG meta directory, format 1 is already at the most recent format. ?09:04
matkorah09:06
matkorsorry09:06
matkorupgrade vs update confusion :)09:06
bignoseif I don't see a command in the 'bzrlib' package, but I know it's provided by core Bazaar (not a plug-in), how do I find out how to run it programmatically?09:20
bignosee.g. 'version-info'09:20
LarstiQbignose: I always start by `vim bzrlib/builtins.py`09:21
LarstiQbignose: version-info specifically is in bzrlib/cmd_version_info.py09:22
bignosehmm. so I should 'import bzrlib.cmd_version_info' to get it?09:23
LarstiQbignose: well, it is possible to rund the cmd objects, but often that is not exactly what you want09:24
bignoseindeed.09:24
LarstiQbignose: depends on what you're doing ofcourse09:25
bignoseI'm hoping there's a better API to get the output of the command, and specify its inputs09:25
bignose(so now I guess my question is specifically about the 'version-info' command)09:25
bignosethat module exports only the Command class09:25
bignoses/class/subclass/09:26
LarstiQbignose: I'd forego the cmd object and directly do builder=format...09:26
LarstiQbignose: are you thinking of specifying a tempate in a file instead of as an argument?09:27
LarstiQtemplate, even09:27
bignoseyes, potentially09:28
LarstiQbignose: then I request you submit a patch, because I want that too ;)09:29
LarstiQbignose: are these enough pointers for now? If so, I'm going afk for the day09:30
bignoseLarstiQ: thanks very much, yes09:30
LarstiQcool09:34
LarstiQ*runs*09:34
lifelessbignose: you _can_ do cmd_class().run_argv(argv), but thats a pretty crude way to reuse code09:46
bignosebzrlib.export.export(workingtree.branch, export_dir_path, format="dir")10:28
bignoseFile "/usr/lib/python2.5/site-packages/bzrlib/export/dir_exporter.py", line 38, in dir_exporter inv = tree.inventory10:29
bignoseAttributeError: 'BzrBranch6' object has no attribute 'inventory'10:29
bignosewhat API should I be using for export? the above doesn't seem to work on a branch as referenced by 'bzrlib.workingtree.WorkingTree.branch'10:30
james_wbranch.repository.revision_tree(branch.last_revision())10:31
james_wthat will get you the last committed revision on the branch as a revision tree, and export works on trees10:31
bignosehmm. so I know how to get from "arbitrary path somewhere in the working tree" to a WorkingTree instance10:32
bignosehow do I get a repository?10:32
jelmerbignose: WorkingTree.open_containing(path)10:32
bignosejelmer: yes, that's the part I know.10:32
jelmerthat'll return a workingtree instance and path relative to the path in the working tree10:32
jelmerbignose: workingtree.branch.repository10:33
bignoseso I need to do 'branch = workingtree.branch', then 'tree = branch.repository.revision_tree(branch.last_revision())', then 'bzrlib.export.export(tree)'10:34
bignoseyes?10:34
jelmerbignose: yep10:35
jelmerbignose: branch.basis_tree() is a shortcut for branch.repository.revision_tree(branch.last_revision()) btw10:35
bignosejelmer: excellent, thanks10:36
bignosefrom a branch instance, how can I get the branch root?10:42
jelmerbignose: the URL of the branch you mean? branch.base IIRC10:43
bignoseno, the filesystem path as output by 'bzr root'10:43
spivThat's the .basedir of the workingtree.10:44
bignosespiv: thanks10:44
spiv(Which may be the same as the osutils.local_path_from_url(branch.base) a lot of the time)10:45
lifelessor10:48
lifelesstree.basis_tree()10:48
lifelessif you want the wt's parent rather than the branch tip, which could be different10:48
awilkinsmarkh: Ping?12:47
matkorHmmm I upgraded to bzr 1.6.1, done bzr upgrade now, when starting olive (bzr-gtk) bzrlib.errors.NoSuchRevision: KnitPackRepository('file:///home/users/matkor/.bzr/repository/') has no revision ('matkor@laptop-hp-20080918151249-q38r0dgg95jsnhqi',) .. any suggestions ?12:49
matkorHm I had to get back to old (Knit) version of repo ... should I fill bug somehow ?13:05
matkorby repo has 119 MB and contains data I do not want make public ...13:06
gnomefreakok something is really wrong with bzr bd :( on first build using -S -sa everything goes into build-area (that is good) now without doing anything to build-area i build without -S -sa and everything gets pulled from build-area and goes into work/ except for source.changes file13:10
james_wgnomefreak: -sa isn't a valid option to bd, could you be more specific in what you are doing please?13:12
gnomefreakjames_w: first build (source or binaries) everything goes into build-area   2nd build (source or bins) everything gets removed from build-area except sources.changes and put into work13:16
gnomefreakdir13:16
gnomefreakjames_w: that is what is causing the cheksum mismatch i showed you earlier13:16
james_wgnomefreak: yes, I understand13:17
james_wI'm trying to find out where the bug is, are you now saying that it doesn't matter whether the second is without "-S -sa", everything still gets moved?13:17
gnomefreakjames_w: right that is why ~jjv worked and other one failed13:18
gnomefreakfailed -- errored on lintian13:18
james_wcan you give me the transcripts of this happening then please?13:18
gnomefreakjames_w: i got rid of the build clutter http://pastebin.mozilla.org/53984013:21
james_wthanks13:22
gnomefreakjames_w: np13:22
james_w->mozillateam13:23
gnomefreakok13:23
gnomefreakyou mean try that command?13:23
jelmerjoin #samba-technical16:09
jelmerargh16:09
beunotsk tsk, look at jelmer trying to get people to join his channel...16:10
james_whey jelmer16:11
james_whey beuno16:11
jelmer:-)16:11
beunohey james_w!16:11
james_whow you guys doing?16:11
jelmerHey beuno, james_w16:11
beunohowdy jelmer16:11
* Jc2k resists jelmers demands16:11
* beuno is getting ready to go to NZ for a week16:11
jelmerbeuno, lucky bastard.16:12
beunowell, it's 24h flight plus 16h timezone shift16:12
beunoI'm not sure how that's going to pan out16:13
jelmera week is not a very long time though  - where are you going there?16:13
beunoDunedin, to visit thumper16:13
jelmerah, Dunedin is nice16:14
beunoyou've been there?16:14
jelmeryeah, a couple of years ago16:14
jelmera friend of mine lives near Dunedin at the coast16:15
* beuno is impressed16:15
beunobrb16:17
=== bac is now known as bac_fud
Leonidasis there a way to create ghost revisions on purpose via the command line?17:52
jelmerLeonidas, nope, API only afaik17:55
Leonidasjelmer: ok, thanks, so I'll write myself a small helper which does that.17:55
=== sdboyAAARR is now known as DrunkOnGrog
bialixjam: hi18:02
jamhi bialix18:03
=== bac_fud is now known as bac
=== DrunkOnGrog is now known as sdboyAAAAAR
abentleybialix: I'm closing down the server you have a unix account on.  If you need anything off it, it's at old.aaronbentley.com.18:38
bialixabentley: thank you, but I don;t have there anything. If there still my files, you can delete it18:39
abentleybialix: Cool.18:39
bialixthanks for the fish18:39
abentleybialix: I tried to let you know by email, but your server dropped the message: http://pastebin.ubuntu.com/48368/18:40
bialixukr.net is a free mail server18:41
abentleybialix: Okay.  Just letting you know.18:44
bialixthx18:44
=== Verterok is now known as Verterok|out
abeaumonthi, i've a svn repo mirror as explained in user guide's 8.2.3 section, which are the commands to have the bazaar mirror synchronized with subversion repo?19:53
=== mark2 is now known as markh
tvainikaDo you know about gnome's bzr mirror (bzr-playground.gnome.org), does it sync changes bi directionally? Can I commit with bzr to bzr-playground, or should I commit my changes with bzr-svn to normal svn.gnome.org?20:01
beunojelmer, do you know?  ^20:02
jdobrieni need some assistance resolving a simple conflict with bzr merge20:03
jdobrienit's a one line conflict and i know what i want in my new branch20:03
beunojdobrien, so what's the problem?20:04
jdobrienthe new branch as the proper line it it20:04
jdobrienbut when ever i remove the <<< >>> and try to commit, it says Conflicts detected ...20:05
beunojdobrien, so, you removed all the >>>, <<<<, and  ====20:05
beunorun "bzr resolve"20:05
jdobrienahh!20:05
jdobrienbueno: thanks20:06
beunowelcome'20:06
beunomy turn!20:07
beunoanyone know how I can push a branch to a remote server, and create the working tree automatically?20:07
jdobrienbeuno: can't you just scp the whole folder?20:14
LarstiQjdobrien: bad idea20:14
jelmertvainika, afaik it's one way - pushing to svn.gnome.org should work20:15
LarstiQbeuno: push-and-update is not sufficient I presume?20:15
beunoLarstiQ, it would, but I'm not sure it creates the working tree the first time?20:16
LarstiQbeuno: good question20:18
beunomy feeling is no, since the plugin just does the push and updates20:19
beunowhich will error20:19
=== ferrouswheel_ is now known as ferrouswheel
jdobrienLarstiQ: thanks, i didn't realize all the capabilities of bzr push20:27
beunook, so next question20:30
beunowhich I've seen answered a billion times, but can never remember20:31
beunohow do I create a working tree from the pushed branch?20:31
Peng_beuno: "bzr co"?20:32
LarstiQbeuno: what Peng_ said20:33
beunomarianom, what Peng_ and LarstiQ said  :)20:33
beunothanks guys20:33
beunothat's why I never remember20:33
beunoit doesn't make sense to me20:33
tvainikabeuno: co = checkout just like in svn, cvs or any other "old fashion" vcs, why it doesn't make sense?20:35
beunobecause I'm within a branch, and I'm checking it out into itself20:36
beunoblows my mind for some reason20:36
fullermdSure; you're making a working tree for a branch.  That's what checkout does   :)20:37
LarstiQbeuno: this is the other sense20:37
Peng_hg uses "hg update" both to change the working tree to an arbitrary revision and to delete the working tree ("hg up null", since it treats no tree and a tree set to the null revision identically). More intuitive, IMO.20:37
Peng_Also one command vs. three.20:37
fullermdWow, that sounds utterly insanely bizarre.20:37
Peng_Haha.20:38
Peng_Both are slightly odd, with "hg up null" and "bzr co", so whatever.20:38
* Peng_ shrugs.20:38
LarstiQbzr co corresponds to .bzr/checkout/, which is the metadata for the working tree20:38
fullermdbzr co never seems odd in the slightest to me.  In CVS, you use 'cvs co' to create a working tree.  In SVN, you use 'svn co' to create a working tree.  In bzr, you use 'bzr co' to create a working tree.20:38
fullermdHeck, in RCS you use 'co' to create a working file...20:38
fullermdIn SCCS, you just kill yourself.20:39
LarstiQ:)20:39
beunoah, that makes more sense20:39
jdobrienIn VSS you kill everyone else...and then yourself20:39
beuno"bzr co corresponds to .bzr/checkout/, which is the metadata for the working tree" is what I was looking for20:39
beunothanks LarstiQ20:39
fullermdBut you fail at killing yourself, because your weapon corrupted itself from being used too many times.20:39
Peng_That does make sense, but it still bothers me.20:40
* fullermd still thinks it bothers you because you had the misfortune to hear the phrase 'bound branch'.20:40
Peng_fullermd: Right.20:40
fullermdKnowing too much about the underpinings of lightweight and heavyweight and whatnot muddles the issue severely.20:40
* LarstiQ nods20:41
fullermdIf you just stick with 'checkout creates a working tree for a branch', and ignore the lower level stuff as trivial implementation issues that don't affect anything else, it's much easier to work with.20:41
fullermdI'm a firm believer that overcommunication of that causes a LOT of unnecessary trouble in the user-base.20:42
fullermdDoubled and tripled the moment somebody mentions 'commit --local'.20:42
jdobrienfullermd: probably better than complete ignorance, such as mine20:43
fullermdI'm not sure of that, really.  You don't _need_ to know any of the difference, until you reach below the covers with something like ci --local and unmask it.20:44
jdobrienyou must have missed my suggestion :-)20:44
GaryvdMHi - We sometimes see a problem in qlog, where the following error is written to the console:20:47
GaryvdMUserWarning: LockableFiles(<bzrlib.transport.local.LocalTransport url=file:///C:/Documents%20and%20Settings/Gary/My%20Documents/bzr/.bzr/repository/>) was gc'd while locked20:47
GaryvdM  warnings.warn("%r was gc'd while locked" % self)20:47
GaryvdMWhat can I do to debug this20:47
GaryvdMI've checked that all our lock_read()'s have try: finally: unlock()20:48
LarstiQhmm, no bpierre20:49
=== bac is now known as bac-meeting
LarstiQGaryvdM: all I know is to direct you to spiv ;)20:50
GaryvdMOk20:50
beunoand, it's saturday for spiv, so he probably won't be here for a couple of days  :)20:51
LarstiQGaryvdM: only qlog has that?20:52
GaryvdMyes20:52
LarstiQGaryvdM: it also happens in bzr selftest runs btw20:52
LarstiQGaryvdM: based on that summier knowledge, I'd say it's either something tests and qlog do the same, or it is a bzrlib problem.20:53
LarstiQGaryvdM: can you reproduce it reliably?20:53
GaryvdMCurrently20:53
GaryvdMIn fact I've just realised that it happens when you click Refresh\20:54
GaryvdMWhich reopens the branch.20:54
GaryvdMNow that I realized that - it should be easy to fix :-)20:55
LarstiQGaryvdM: aah :)20:58
LarstiQdoes anyknow how I can reach bpierre_ other than waiting till he shows up here again?21:02
jelmerjoin #ctrlproxy21:06
jelmerargh21:06
jelmernot my best day21:06
beunotwice, you're borderline spamming!  :p21:08
emmajanebeuno: You're around. :) I have a question for you...21:09
emmajaneHow did you tag your web site files in terms of release information.21:09
emmajanefor example: I have just uploaded a series of files for a client to look at. I should probably take a snapshot now so that I can roll back to this point. I don't think I want a branch... but I'm not sure what I want.21:10
Odd_Blokekick jelmer Spamming.21:10
LarstiQOdd_Bloke: I haven't had time to look at testing bisect yet21:11
jelmerOdd_Bloke, :-)21:11
* jelmer waves at beuno, emmajane, Odd_Bloke and LarstiQ 21:12
* emmajane waves21:12
* LarstiQ waves at jelmer 21:12
emmajane(and that was an open question if anyone else has suggestions :) )21:13
* fullermd waggles.21:13
beunoemmajane, you want to tag the uploaded set of files?21:13
beunothe revid is uploaded to a hidden file21:13
fullermdI dunno.  Tags are easy and cheap.21:13
beunoif you add a tag to the branch21:13
beunoyou can easily map those two later on if needed21:13
LarstiQemmajane: a tag sounds reasonable21:14
fullermdAnd after all, you can always create a branch from that rev later if you turn out to need a branch.21:14
beunoand/or push that specific revision21:14
emmajanebeuno: I'm just "manually" uploading files at this point because I'm lazy (at least I remembered to bzr init though *grin*). I think it makes sense to have some kind of history that I can roll back to. Normally I rely on my memory and my commit messages. But there must be something more efficient...21:14
* emmajane nods.21:14
emmajanetags are like flags, right?21:14
emmajanejust sort of a "hello!! over here!" note?21:14
beunoemmajane, you mean you didn't use bzr-upload?21:14
LarstiQemmajane: "manual" sounds like more work than I'm willing to do ;)21:14
emmajanebeuno: I know, I know. :/21:15
beunoheh21:15
beunowell21:15
beunoif you *do* use bzr-upload, the plugin uploads a file with the revid21:15
emmajanebeuno: I'm already a day late on delivering the specs so I'm amazed I remembered to even think about revision control. It's a start. :)21:15
beunoso you know what revision was uploaded21:15
Odd_Blokebeuno: Presumably that's overwritten next time the upload happens?21:15
* Odd_Bloke hasn't even looked at bzr-upload.21:15
LarstiQGaryvdM: you're not going to be in .nl somewhere this year perchance?21:15
beunoOdd_Bloke, yeap21:16
* fullermd has lost count of how many days late he'd be for things if he WEREN'T thinking about revision control :p21:16
beunothere's no history of uploads21:16
beunowe'd need to develop a revision control system on top of a plugin for revision control21:16
emmajanefullermd: heh21:16
beuno(or, just keep on adding the uploaded revs to the current file, which is very cheap and easy, but no fun at all)21:17
beunoemmajane, anyway, if you've just uploaded manually21:17
LarstiQbeuno: ah, but think about the scalability!21:17
emmajaneat this point I've uploaded it to /client_name/v1-layout/files.html so that they know they're looking only at the "general layout" .. once they've approved that I'll give them sub-nav.21:17
beunojust do:  bzr tag something_to_rmemeber_it_by21:17
Odd_BlokeWe should write it in C, and really obfuscate the UI.21:17
Odd_BlokeThen it'll be _fast_.21:17
* emmajane nods.21:17
beunoand you can come back to that later on21:17
beunobzr tags21:17
emmajaneYeah. I think that's what I want.21:17
beunowill show you all the tags21:17
emmajanefor example: bzr tag v1_upload21:18
fullermdOdd_Bloke: Obfuscated UI is nice and all, but C is a pain, and fast is overrated.  If you just wrote it in Haskell...21:18
* LarstiQ cringes at the nested-trees/bzr.dev diff21:18
emmajanePS I hate IE...21:18
* jelmer cheers on LarstiQ 21:18
beunoemmajane, we all do  :)21:18
emmajaneJust thought I'd throw that in there.21:19
* emmajane grins.21:19
Odd_Blokefullermd: :D21:19
emmajanethanks for the suggestions, everyone. :)21:19
beunowelcome'21:19
beunoand, hurray for LarstiQ finishing nested tree support!21:20
LarstiQhah, that's a bit premature :)21:22
beuno:)21:23
NfNitLoopooh, nested tree support.21:24
emmajanea tag applies to all files, not just the files in that sub-directory, right?21:24
NfNitLoopWhat sort of support is that?  :)21:24
LarstiQNfNitLoop: lp:~larstiq/bzr/nested-trees21:24
jelmeremmajane, yep21:24
LarstiQemmajane: it applies to a revision, so the versions of all files in the tree at that point21:25
* emmajane nods21:25
emmajaneand I assume I have to commit after adding a tag?21:25
beunonope21:26
emmajaneinteresting.21:26
beunothat's one way of putting it, yes  :)21:26
emmajanewhat happens if there are changed files ... does the tag apply itself to the last commit?21:26
LarstiQbeuno: it's a 97k diff, so this will take a while. And then there is fixing the outstanding problems off course. But if you want to help stress test whay I do, please!21:26
fullermdThe tag points at whatever revision you tell it to point at (which is the last commit if you don't say something else)21:27
* emmajane nods21:27
emmajaneagain.. "interesting"21:27
emmajanetags == flags == bookmarks.21:27
beunoLarstiQ, ah, 97k sounds like fun. Another reason to finish the implementation ASAP  :)21:28
beunoI'll branch and start poking at it21:28
beunowhat repo format do I need to use it?21:28
LarstiQbeuno: --development-subtree21:29
beunoLarstiQ, Format <RepositoryFormatKnit1> for lp-140342092:///~larstiq/bzr/nested-trees/.bzr is deprecated - please use 'bzr upgrade' to get better performance21:29
LarstiQbeuno: bpierre was trying it out yesterday, and didn't get it to work. I got the same thing. But today I tried afresh, and it works. Difference: using a repository or entirely standalone (the latter works)21:30
LarstiQbeuno: so be warned of that21:30
LarstiQbeuno: yeah, I know :)21:30
LarstiQbeuno: and nested-trees is probably one of the trees with funky revisions, so I'll need to reconcile it.21:30
GaryvdMLarstiQ: No - I live in South Africa21:31
* LarstiQ nods at GaryvdM 21:31
LarstiQGaryvdM: but that in itself doesn't prevent you from visiting :)21:31
GaryvdMYes21:31
GaryvdMI don't think so.21:31
GaryvdMI'm not working in IT atm.21:32
LarstiQGaryvdM: ah, ok.21:32
GaryvdMDo you know me?21:32
beunoLarstiQ, note, need a standalone21:32
LarstiQGaryvdM: nope!21:32
LarstiQGaryvdM: other than from qbzr21:33
GaryvdMOk - was just wondering - cause I worked in Maastricht for a while.21:34
LarstiQGaryvdM: most people from South Africa I know live/work in the Delft area. And the StoneThree people.21:35
=== BasicPRO_ is now known as BasicOSX
GaryvdMThat is interesting.21:36
=== beuno is now known as beuno-afk
=== AnMaster_ is now known as AnMaster
=== mw is now known as mw|food
danielfolsomwhenever i try to do bzr launchpad-login Danielfolsom, an error comes up: " https://launchpad.net/%7EDanielfolsom/%2Bsshkeys is permanently redirected to https://launchpad.net/~danielfolsom/+sshkeys "22:20
danielfolsomany ideas?22:20
LarstiQdanielfolsom: try with daniefolsom instead of Danielfolsom?22:21
LarstiQmodulo the l22:21
LarstiQdanielfolsom: the point being upper -> lower case22:21
danielfolsomomg that did it22:21
danielfolsomi'm so sorry22:21
LarstiQdanielfolsom: that's ok :)22:21
danielfolsomthanks very much!22:21
=== bac-meeting is now known as bac_afk
LaserJockI've got a perhaps stupid bzr repo question22:28
LaserJockif I've got a repo, and then two branches that are similar, but different depths, will they still share history?22:29
danielfolsomdoes anyone who uses bzr on a mac know if there's a way to update it? And also, would anyone know why bzr would keep freezing up (very consistently)?22:29
LaserJockmy use case is using bzr svn to get different depths of a SVN repo22:29
LarstiQLaserJock: yes22:29
LarstiQLaserJock: what do you mean with 'different depths' of an SVN repo?22:30
LarstiQdanielfolsom: get a newer version of bzr? I'm not a mac user, but doesn't bazaar-vcs.org carry .dmgs?22:30
LaserJockwhat I mean is, the svn repo has a trunk/<project>/ structure22:30
LarstiQdanielfolsom: and could you describe the freezing in more detail?22:30
LaserJockif I branch both trunk/ and trunk/project/ will the repo know that they share history?22:31
LarstiQLaserJock: bzr init-repo repo; cd repo; bzr branch foo; mkdir deeper; cd deeper; bzr branch bar;22:31
danielfolsomLarstiQ: oh ok - and then just another random question - is there any way to uninstall? (just so i know for future reference)22:31
LarstiQLaserJock: foo and bar share history22:31
danielfolsomLarstiQ: it just stops about 1/4 of the way through22:31
LarstiQLaserJock: specifically in the case of svn though, they might not have any revisions in common, possibly22:31
LarstiQdanielfolsom: on mac? No clue. For me it would be apt-get remove bzr.22:32
LarstiQdanielfolsom: I think it's not freezing, but rather taking a long time.22:32
danielfolsomLarstiQ: possibly - i'll get back to you after i update - it does say it has to redirect22:33
danielfolsomBasicOSX: i assume you use bzr with a mac22:37
BasicOSXdanielfolsom:  hourly22:38
danielfolsomdo you know how to uninstall (I'd like to know for the future)22:38
BasicOSXI pull from bzr.dev repo22:38
BasicOSXI don't use a package or anything like that22:38
danielfolsomahh ok - thanks22:38
danielfolsomso just bzr pull bzr.dev repo - and that's it?22:39
BasicOSXLook at appzapper, it will do what you want22:39
BasicOSXin ~/projects/bzr.dev22:39
LarstiQgoing out on a limb here, but don't .dmgs have their own uninstall facilities?22:39
BasicOSXthen I symlink ~/bin/bzr to ~/projects/bzr.dev/bzr22:39
BasicOSXand make sure ~/bin/ is first in my path22:39
BasicOSXjust drag the app into trash that does what you want22:40
BasicOSXappzapper will kill all conf files and whatnot22:40
danielfolsomhaha - that's all a bit over my head22:40
BasicOSXosx != windows22:40
danielfolsomand i can't actually find the bzr app, so i don't think appzapper will work22:41
BasicOSXif installed via dmg should be in /Applications22:41
danielfolsomyeah - i can't seem to find it22:41
danielfolsomso i guess that means i didn't install via dmg22:41
LarstiQdanielfolsom: darwin ports or similar?22:42
danielfolsomside question: the way you know that bzr is frozen is if the line stops spinning, right?22:42
danielfolsomLarstiQ: idk, sorry - i've never used darwin before i don't think though22:43
danielfolsompossibly via svn ... for some reason i just can't find anything22:43
LarstiQdanielfolsom: no, the line can spin so slowly that you don't see it moving22:43
danielfolsomo ok22:43
BasicOSXthere is a darwin port, but I haven't used it22:43
danielfolsomwhen i put bzr in the search box i get README.txt, bzr.rb, bzlib.h, and bzlib.h - i don't know why there are two22:44
LarstiQbzlib.h is bz2 compression, nor bzr22:44
danielfolsomthat's weird - it's still saying i need to update the server to bazaar 1.2, but usng bzr branch http://bazaar-vcs.org/bzr/bzr.dev bzr.dev - i thought i just upgraded to 1.522:48
Peng_danielfolsom: Known issue. An RPC was removed in 1.6, so older clients assume the server is older than 1.2.22:48
* Peng_ just walked in on this conversation.22:49
danielfolsomhaha no worries22:49
danielfolsomactually my real problem is  bzr isn't downloading successfully - it did what i said correctly, but when i do bzr branch lp:getting-down-with - it stops 1/4 of the way through22:50
danielfolsomand i don't think that it's that huge of a file22:50
LarstiQ/home/larstiq/bin/bzr get lp:getting-down-with  2.39s user 0.40s system 10% cpu 26.783 total22:51
LarstiQit isn't that huge22:51
LarstiQdanielfolsom: do you have strace or somesuch?22:52
danielfolsomstrace? no22:52
danielfolsomoh wait! Wow, well it took 10 minutes (13 minutes to be exact), but it finally got it22:53
danielfolsomthanks for all your help!22:53
LarstiQdanielfolsom: np.22:54
=== BasicTheProgram is now known as Basic
LaserJockhuh, fascinating23:01
LaserJockbzr is really smart23:01
LaserJockor maybe I'm just a tad slow ;-)23:01
LaserJockbut it amazes me that I could create a shared repo, bzr branch trunk/ from an LP code import, and then bzr branch trunk/<project/ from the SVN repo directly23:02
danielfolsomok i have one more question (sorry to keep coming back): is there a way to see what someone did in a specific diff?23:03
=== BasicPRO is now known as BasicOSX
LaserJockand I lose nothing, each branch only costs me 40KB23:04
danielfolsomanyone know?23:07
fullermddanielfolsom: What, you mean just from bzr diff?23:07
danielfolsomcan you use diff to see what someone did in a certain revision? Say revision 177?23:08
fullermdbzr diff -c17723:08
danielfolsomo sweet - i never knew about that23:08
danielfolsomthank you!23:09
LaserJockbzr help diff has lots of neat things you can do :-)23:09
LarstiQdanielfolsom: you're welcome to stay around, no need to quit :)23:10
danielfolsomsweet :)23:11
LaserJockLarstiQ: do you know if either possible or done already to have bzr remove unneeded revisions from a shared repo23:12
LarstiQLaserJock: one way is branching to a new repository23:14
LarstiQLaserJock: sorry, I'm falling asleep right now23:14
LarstiQLaserJock: also look at the plugins page23:15
jfroy|workw00t23:15
=== mw|food is now known as mw
jfroy|workI completed Brian de Alwis's work and did the small bit of work left in bzr-svn's ra.c file to enable keychain authentication on Mac OS X23:15
LarstiQjfroy|work: cool!23:16
* LarstiQ detaches, be back tomorrow23:16

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