[00:50] Does anyone use Bazaar to version Java projects built with Maven? [01:18] maxb, I do [01:18] maxb, Oh ,wait, I version the sources [01:18] maxb, Not the outputs [01:42] maxb: geez, you're in every revision-control channel! :) === timchen1` is now known as nasloc__ [03:56] * igc lunch [03:58] * mwhudson stares at bzr for setting BZR_HOME to a unicode string in a test case [04:03] hmm, seems r4707.1.1 is at fault [04:05] nice === lifeless_ is now known as lifeless [05:38] igc, hi? [05:38] hi poolie1 [05:38] hi [05:38] i thought we could try to get sphinx going [05:38] poolie1: +1 from me [05:38] i just need to find where they installed this thing [05:39] poolie1: 35067 is the rt# if that helps [05:40] k [05:40] i always get confused between pchroot schroot and dchroot :) [05:41] ie 3 implementations of more or less the same thing [05:41] anyhow i have the mail [05:41] dchroot is now just wrapper of schroot [05:42] heh [05:42] I have no name!@escudero:/$ exit [05:44] igc: so you should be able to run [05:44] dchroot -c karmic [05:44] then sphinx-build seems to work [05:44] the environment is a bit rough and ready though - no /etc/passwd, hence the message i pasted above [05:47] poolie1: so dchroot -d karmic works for me [05:47] ok [05:47] where/how do you want to build things? [05:47] i'm just going to try going into a current checkout and building the docs there [05:47] it builds them under my home directory at the moment [05:47] but that's not available inside the chroot [05:47] poolie1: can we start small? [05:48] bzr+ssh://bazaar.launchpad.net/~bzr/bzr-alldocs/trunk/ [05:48] what do you have in mind? [05:48] this is the wrapper site over doc.bazaar-vcs.org/en, ru and the other languages [05:48] oh ok [05:49] I just added the bzr team tracker to these a few minutes ago [05:49] and how do i build things inside it? [05:49] checked out to /srv/bazaar.canonical.com/doc/alldocs [05:49] "team tracker"? [05:49] pull the branch, then run the magic script ... [05:51] http://doc.bazaar-vcs.org/alldocs/_build/en/ <--- woo [05:51] poolie1: the magic script is build_sites.py as you probably seen by now [05:51] yep, done, and the results are in that url [05:52] it looks good to me, what do you think? [05:52] is there meant to be an html file above the /en/ directory? [05:53] poolie1: something not quite right ... [05:53] did you get rev 26? [05:54] poolie1: maybe we just need to reset the sym links to point to the new build locations? [05:54] instead of into my home area? [05:54] i do have r26 [05:55] which symlinks? there don't seem to be any in the tree [05:56] poolie1: ok. (confused with other bits) [05:56] * igc keeps looking [05:57] the other questions are: is: [05:57] at what url do we eventually want this to appear [05:57] and how should it mesh with the docs that are already there [05:58] poolie1: ok. /en is a copy, not a link to the site [05:58] so we could change that or ... [05:58] change the build script to copy to the right place [05:59] poolie1: I think linking is ok [05:59] doc.b.o/en is the old version uploaded by you [06:00] i haven't changed it yet [06:00] poolie: answering your Qs ... [06:00] as you said, small steps [06:00] doc.b.o/en, doc.b.o/es, etc. all need to point into the area you just built [06:00] ok [06:00] what do we want to have at the top level of the site [06:01] like under doc.b.o/ [06:01] no change for now? [06:01] poolie1: right now, let's leave it as is [06:01] poolie1: it's helpful for users wanting to find a particular version ... [06:01] e.g. 2.0.0 when 2.0.1 is out [06:02] the en/ru/etc pages don't reveal *every* old version, just the latest point release of old versions [06:02] right [06:02] how do they know which versions to link in? [06:03] ideally they wouldn't have to be updated on every release === mzz_ is now known as mzz [06:03] poolie1: the en/etc pages link to logical names ... [06:03] latest, test, development [06:05] poolie1: I update the symlinks when new versions roll out currently [06:05] (after rebuilding docs, uploading them, editing the cover sites, uploading them, etc.) [06:05] ok [06:05] (it's a pain) [06:05] maybe we can automate that more separately [06:05] so [06:06] could you please login, run 'umask 2' to make things you touch group writable [06:06] then move the en fr ja ru docs into old-sphinx [06:06] and then we can try making symlinks into alldocs [06:07] umask 2 done [06:07] poolie1: en etc moved [06:08] poolie1: you doing the new links? [06:08] yes [06:08] you'd just made the old ones unwritable by anyone else [06:08] and i don't have sudo so i needed you to move them [06:08] thanks [06:09] k http://doc.bazaar-vcs.org/en/ looks good now? [06:09] yep - sweet [06:09] just tried View>Page Source and I see the new JavaScript [06:09] how are you meant to reach the non-english versions? [06:09] great [06:09] links at bottom of page [06:09] to other languages [06:10] see them? [06:10] all tested ok [06:11] poolie1:^ [06:12] ah ok i see it [06:12] i overlooked it [06:12] imbn if it was in the footer on somewhere that's more clearly meta-content [06:13] [06:13] that looks good [06:14] poolie1: so the next 3 simple ones are ... [06:14] igc, the script that built the old documentation has some code to determine the right versions [06:14] we could glue that in [06:14] migration, plugins and explorer [06:15] ok, they're separate trees? [06:15] poolie1: by glue, you mean generate the version numbers current in bzr_alldocs_conf.py? [06:15] right [06:16] sure [06:16] or to do something to make it non-manual [06:16] are the migration, plugins and explorer things separate trees like this? [06:16] sphinx may even let us see them on the command line if that helps [06:16] i'm at spiv's house now and i need to go home from here in a sec [06:16] yes, different trees [06:16] i'm just going to setup a cronjab [06:16] job* [06:16] :-) [06:16] could you mail me the branches? [06:16] die cron die [06:16] :-) [06:17] sure [06:17] thanks btw [06:17] I'll email you now [06:17] poolie1:^ [06:17] np, thanks for setting it up [06:17] say hi to spiv [06:17] igc: hi :) [06:18] poolie1: it looks good, it just fiddly to maintain [06:18] this will help [06:18] hi spiv! [06:18] k cronjob seems to work [06:19] now we'll see how many errors turn up when it really runs :) [06:19] :-) === jelmer is now known as Guest85358 [06:55] hi al [06:55] all even [07:11] Hi. :) Though I'm probably about to go AFK. :P === Guest85358 is now known as jelmer === jelmer is now known as Guest78392 === Guest78392 is now known as jelmer [08:04] hey guys, does anyone know a good way of getting an application shortcut to bzr explorer on mac os x? [08:07] Glenjamin: send a patch ? :-D [08:07] ? [08:08] Glenjamin: kidding, try getting in touch with igc [08:09] but his week-end is about to begin (Australian time zone), what do you want exactly ? A short-cut for an existing command or the ability to assign short-cuts from outside bzr explorer itself ? [08:09] just a shortcut with an icon to run bzr explorer [08:10] the guide recommends I make one and pin it to the dock, but doesn't say how to [08:10] ohhh, that kind of short-cut, sry. I can't help here, I haven't installed bzr explorer on my mac [08:18] Glenjamin: try emailing the bzr-mac list for input. See https://launchpad.net/~bzr-mac [08:18] ah, ta - I was just posting a question on the bzr-explorer page :) [08:26] night all - have a good weekend [08:27] igc: g'night [08:27] g'night Ian [09:18] hello, looking for some help with loggerhead [09:51] Oh thank goodness leo left, I was just checking IRC before going to bed. :P === mrevell is now known as mrevell-lunch === mrevell-lunch is now known as mrevell [14:56] The location where I need to pull/push my branch changed. How can I tell bzr that this is where it should always pull/push instead of having that only work once. [14:58] MTecknology: --remember ftw ! [14:58] vila: thanks :) === sdboyer is now known as sdbuhura === mfer is now known as DathkaGraush === DathkaGraush is now known as mfer [16:11] hi GaryvdM [16:11] Hi Alex [16:11] I can work on 0.14.5 today [16:12] bialix: Cool - I just stared looking at it to. [16:12] 2 weeks ago we discussed what we want to backport from 0.15 [16:12] I want to g through that list today [16:12] *go [16:13] feel free to mark any bug for backport [16:13] Yes [16:13] cool [16:13] let's go :-) [16:15] * bialix likes bug-url command, thanks luks [16:18] anyone with bzr on windows ? [16:18] what? [16:18] I need to test a little thing [16:18] * sidnei raises hand [16:18] i would have to restart though :( [16:19] what bzrlib.user_encoding returns ? [16:19] * bialix on windows but a bit busy [16:19] I mean the exact string [16:19] visik7: it returns ANSI encoding [16:19] yes but could you run it and tell my your ? [16:19] visik7: it depends on current user settings [16:19] I know [16:19] for me (Russian) it's cp1251 [16:19] and is there a way to get this encoding without bzrlib ? [16:19] visik7: I'm also on windows, what was the original question? [16:20] for US/Western Europe I believe it's cp1252 [16:20] jam I'm tring to remove the bzr dependancies from a program that use bzrlib to get the current encoding [16:20] visik7: do you mean via python? [16:20] yes [16:20] visik7: if you look at bzrlib/osutils.py it has the details of how we determine the encoding [16:20] something like [16:20] look at the code [16:20] import locale; locale.getpreferredencoding() [16:21] though there is also [16:21] sys.getfilesystemencoding() [16:21] and stuff to determine the terminal encoding [16:21] thanks [16:21] all different [16:21] hi jam [16:21] the FS enc is ok [16:21] filesystem is usually 'mbcs', locale is usually latin-1, and terminal is cp??? [16:22] latin-1 == cp1251? [16:22] cp1252, rats [16:22] bzrlib use terminal locale or fs ? [16:22] I look the code [16:23] visik7: fs encoding for *filenames*, locale for the *content* of files (generally) [16:23] and terminal for the way to format bytes for display on the screen [16:23] of course, on reasonable systems *all* of those are "utf-8" :) [16:23] windows supports unicode for filenames, no need to use fs encoding, it's always mbcs anyway === mfer is now known as mfer-soup === deryck is now known as deryck[lunch] [16:35] GaryvdM: I think I've marked all bugs I know: https://launchpad.net/qbzr/+milestone/0.14.5 === GaryvdM_ is now known as GaryvdM [16:37] bialix: cool - I'm going to to the tag one now [16:37] GaryvdM: I'm porting qsubprocess --bencode [16:39] bialix: I did push uncommit commit push on lp:qbzr/0.14, so you may need to do pull --overwrite [16:39] bialix: err - no - you beat me to the second push never mind [16:39] ok [16:46] can a losa check out lp:~bzr-pqm/bzr/2.1.0b2 it was meant to be created from "lp:bzr" but it seems to be at revno 4668, when lp:bzr is at 4778 (about 110 revisions newer) [16:46] jam: sure [16:46] spm created it for me last night, and I didn't notice until today [16:46] mthaddon: if you want to just "bzr push" to force it to update, that would be fine with me [16:46] jam: from current lp:bzr ? [16:47] mthaddon: yeah [16:52] jam: revno 4778 [16:52] thx [16:52] done [16:55] I accidentally pushed the wrong branch to a new lp branch [16:56] how do I revert the lp branch back to the initial state? [16:56] GaryvdM: I see there is all green now [16:57] rats [16:57] corp186: re-push with --overwrite flag [16:57] bialix: I get "No new revisions to push." [16:58] you wrote: corp186> I accidentally pushed the wrong branch to a new lp branch [16:58] do you have copy of original "right" branch [16:58] ? [16:58] ahh, I see what you're saying [16:58] yeah [16:58] cd to "right" branch and push --overwrite [16:59] bialix: thanks, that worked [17:00] always happy to help (c) jam [17:00] :-) === beuno is now known as beuno-lunch === mfer-soup is now known as mfer [17:11] My irc is very lossy - I can only see in chatzilla, half of what I can see here: http://irclogs.ubuntu.com/2009/10/30/%23bzr.html [17:12] And - messages that I have sent don't appear there. No wonder no one answers my questions some times. [17:14] Garyvdm: I've backport all revno I remember [17:14] I see you finished too [17:14] Yes [17:15] bialix: When you are idle, check this out: http://garyvdm.googlepages.com/out.ogv [17:15] Bialix: rename in qbrowse/qcommit [17:15] * bialix opens link [17:15] 1.1mb [17:16] Garyvdm: I'll wait till tomorrow morning to cut tarball, ok? [17:16] GaryvdM: what is ogv? [17:16] Ok - I'm going to do some hacking - on drag and drop move [17:16] ogg video [17:17] Best player on windows for that would be vlc [17:17] hmm, I hope K-lite codec pack knows how to play it [17:18] Hi luks [17:18] GaryvdM: COOOOOOOOOOOOOOOOOOOOOL [17:19] :-) [17:19] and how to move file? drag-n-drop? [17:19] Yes - that's what I'm working on now. [17:19] hey [17:19] oh, cool cool cool [17:19] heya luks [17:20] hi * [17:20] /topic Welcome in #qbzr ;-) [17:20] And for --after - you will be able to select a missing, and a unversioned and chose mark as resolved [17:20] Hi jelmer [17:20] heya jelmer [17:20] what's .topic? [17:21] what's /topic? [17:21] Topic for #bzr is “Bazaar version control system | 2.0.1 and 2.1.0b1 are official! | try https://answers.launchpad.net/bzr for more help | http://bazaar-vcs.org | http://irclogs.ubuntu.com/” [17:21] /topic allows you to change that [17:22] ah, ok [17:24] jelmer: cool article about bzr-svn/git/hg [17:25] jelmer: we all hope on bzr-hg [17:26] GaryvdM: how you made that video? [17:28] bialix: with gtk-recordMyDesktop [17:28] * bialix nods [17:29] bialix: it very easy, but I think it is linux only. [17:29] * bialix nods [17:33] GaryvdM: everything ready to release, will do it tomorrow [17:33] bialix: cool [17:34] I leave 0.16? for you [17:34] bialix: I'm going to see where I can get to with move and rename, and release 0.16 on Sunday [17:34] yes === deryck[lunch] is now known as deryck [17:37] bialix: thanks [17:37] FTW! [17:38] if only there will be something like github or bitbucket but for bzr with reasonable small fee for private repos -- I'll be mostly happy [17:43] GaryvdM: do you have any codename for 0.16 in mind? [17:44] bialix: Sorry - no [17:44] Lots of work in the Tree view [17:44] *TreeWidget [17:45] bialix: whatever happened to the work that rocky burton was doing? [17:45] what's nice tree in your region? [17:45] jelmer: rocky burton? sorry, I don't follow [17:46] GaryvdM: what's nice tree in your region? tree you like? [17:46] bialix: http://en.wikipedia.org/wiki/Acacia [17:47] http://savannaenvironment.files.wordpress.com/2008/04/acacia.jpg [17:48] GaryvdM: Acacia grew and here too [17:48] so let's use its name? [17:48] I see - was just reading the Wikipedia article. [17:49] but in my region it has white flowers [17:50] I'll add Acacia as codename to 0.16, ok? [17:51] GaryvdM ^ [17:51] Cool [17:51] :-) === beuno-lunch is now known as beuno [18:03] bialix: are you using trunk? [18:04] right now I'm testing 0.14.5 [18:04] I'm switching between both from time to time [18:04] * bialix is very busy with my main work [18:05] bialix: Sure, I understand [18:05] bialix: I'm looking for feedback on the new directory grouping in qcommit. [18:06] ok, I'll switch and will test it these days [18:20] Garyvdm: ping [18:21] pong [18:21] Garyvdm: recently I've discovered that qlog FILE don't show revisions where file was removed [18:22] e.g. if you re-add file later [18:22] the same with plain log though [18:22] bialix: yes - know bug, same in log [18:22] bialix: hmm, lovely codename :-) I love Acacias, they can smell so good at times... [18:22] heya vila [18:22] GaryvdM: there is already bug? [18:23] bialix: I think so - trying to find it. [18:23] vila: I have a misteriuos plan according to which we will name all qbzr releases after trees [18:23] bialix: bug 181520 [18:24] lol [18:24] vila: but sometimes it make sense to use something funny [18:24] Launchpad bug 181520 in bzr "bzr log FILE don't show revisions where file was removed" [High,Confirmed] https://launchpad.net/bugs/181520 [18:24] bialix: That's quite appropriate, there so many branches there :) [18:24] GaryvdM: lol, it's my bug [18:25] bialix: I'm sure I also log a dup... [18:25] GaryvdM: I mean: can we fix it for qlog or it depends heavily on bzrlib behavior? [18:25] vila: :-D [18:25] Isn't acacia technically a bush, not a tree? [18:25] GaryvdM: I have feeling that we have fixed it in the past [18:26] bialix: The method is similar for qlog and log, so if we fix it for one , then fixing it for the other is easy. [18:26] bialix: It would be easy to fix, but it would be slower. [18:26] :-/ [18:27] fullermd: wikipedia said it's a group of shrubs and trees [18:27] fullermd: hmm, well, there was one in my parent's home garden, it was a tree, definitely :) [18:27] fullermd: I saw only trees in my city [18:27] there is a lot of acacias [18:28] slower is bad word [18:29] bialix: Here is the bug I logged: bug 368976 That says it only happens log uses deltas, which happens if you do log dir, or log file -v [18:29] Launchpad bug 368976 in bzr "File graph doesn't join re-added files to the main graph" [Wishlist,Triaged] https://launchpad.net/bugs/368976 [18:30] Oh - sorry - thats a different bug. [18:31] GaryvdM: ok, so it's related to the fact file-graph missing deletion [18:31] GaryvdM: that bug looks ok [18:32] bialix: no - Your bug is that it does not show the revision that removes the file. My bug is that if you remove, and re add a *dir*, it only shows the second bit of history, not the first [18:33] bialix: My bug is the one that would be easy to fix, but it would be slower. [18:33] ah, sorry, I misread [18:34] anybody knows about undelete plugin? [18:35] bialix: Your bug - I don't know how we could fix. (Except for looking at the inventory for every revision, which would be much much slower.) [18:35] GaryvdM: so, am I correct that this sort of info just missing in per-file-graph? [18:36] bialix: yes [18:36] bad [18:52] * GaryvdM ventures out to seek food. [19:28] hi, i am noobing here but any time i perform a modification on a file (local branch) [19:28] i first have to bzr add before bzr commit ? [19:32] i need to replace lp: with the right url? [19:32] does someone know where lp points to? [19:35] dereine: lp:project equates to bzr+ssh://bazaar.launchpad.net/~ownerOfMainBranch/project/mainbranchname [19:35] dereine: eg lp:bazaarx equates to bzr+ssh://bazaar.launchpad.net/~bazaarx-dev/bazaarx/dev/ [19:35] Pilky: thx [19:36] so for https://code.launchpad.net/~d7cx/d7cx-views/DRUPAL-7--3 it would be bzr+ssh://bazaar.launchpad.net/~d7cx/d7cx-views/DRUPAL-7--3 ? [19:38] dereine: in theory, yes [19:38] Pilky: is there a public commando from the bzr commando? [19:39] hmm? not sure what you mean [19:39] lau: Only the first time the file is committed. [19:40] How can I delete a tag in a remote repository? [19:40] I know no one else has cloned the branch yet [19:41] corp186: bzr tag --delete [19:41] corp186: Then bzr push [19:42] thx GaryvdM, i have a scenario i do not clearly understand [19:42] 1- i bzr update from a lp bzr repo [19:42] GaryvdM: I even used bzr push --overwrite, but it still didn't delete the tag [19:42] 2- i modify 2 files from my working dir [19:43] 3- i bzr commit to lp bzr repo [19:43] 4- it commits my 2 modified files _+ 2 others files w/ MERGE-SOURCE in them [19:44] what could be the root cause of the MERGE-SOURCE text in these 2 files ? w/o any [19:44] error during the bzr update ? [19:45] corp186: maybe try bzr tag --delete -d url/to/remote [19:45] Pilky: perhaps "bzr get_path lp:foo" would return the bzr+ssh.... url from the project to check out [19:46] lau: What is the url of the branch on lp? [19:46] dereine: I don't there is an option, because if you're using bzr you should be able to just use the lp:foo path anywhere you need to [19:46] dereine: what exactly are you needing the URL for? [19:46] GaryvdM: -d did the trick, thanks :) [19:46] GaryvdM: it is a personal project i prefer not to tell ? i really think it is my fault because [19:46] i am noobing here ... [19:47] Pilky: awesome, i just don't need to transfer the url, just give bzr branch the url, thx for the eye-opener [19:47] dereine: yeah, anywhere there is a path you can pass in an lp:foo eg to branch bzr itself you'd type [19:47] bzr branch lp:bzr mylocalbranch [19:48] Pilky: would it be able to define own shortcuts? [19:50] dereine: I believe so, but I'm not sure how. I think it may require a plugin to be written [19:50] dereine, Pilky: bzr-bookmarks [19:51] https://launchpad.net/bzr-bookmarks [19:51] thx [20:00] GaryvdM: i think know that it was old trash from my working tree [20:01] these 2 files with some MERGE-SOURCE and TREE in them [20:01] without any .BASE, .THIS or .OTHER [20:01] was a old remanation from my working tree, does it make sense ? [20:01] Yes [20:01] lau: You can uncommit, remove the cruft, and then commit again [20:02] lau: If you use qcommit, it will remember the commit message for you. [20:03] yes i did that thx [20:03]