=== schierbeck [n=daniel@dasch.egmont-kol.dk] has joined #bzr [12:03] GaryvdM: hi [12:04] hello [12:04] i just wanted to ask; do you accept somewhat unrelated patches to brokenlines? [12:05] it seems that it'll be merged soon, so i might as well place them there, to avoid any conflicts later on [12:05] (given that phanatic is in on it, of course) [12:06] Yhea - I think you can make patches against vizchanges, and then send them to the list [12:07] With a note that it is of vizchanges. [12:07] ok [12:07] I think that is the best way to go. [12:08] If you send them to the mailing list - I'll test them. [12:08] ok, thanks [12:09] GaryvdM: have i asked you about the title of the viz window? [12:09] Like https://code.launchpad.net/~dasch/bzr-gtk/viz-cleanup ? [12:09] i'd like to rename it "Revision history" [12:09] No [12:09] Am\ [12:10] I agree that it needs to be changed [12:10] yup [12:10] okay, i'll make a quick patch and send it to the list [12:10] if noone raises any objections on the list until tomorrow, i'll merge vizchanges/brokenlines [12:10] sweet [12:10] Cool! [12:11] I do like Revision History because it is consistent with previous vcs I have used. [12:11] But in bzr it is Log [12:12] i know, but i just think that's unintuitive [12:12] And I feel we should use that to be consistent. [12:12] hmm [12:12] i agree that it would be best [12:13] and using 'revision history' consistently would mean convincing the bzr guys it's for the better... [12:13] screw it, i'll use 'log' [12:13] Else try get log changed to history in bzr ;-) [12:13] exactly :( [12:14] i don't know why they picked 'log' -- it really makes no sense [12:14] well, some [12:14] And I think we need to add glog as a alias for viz [12:14] Historical reasons and it is a log of revisions. [12:15] Adding history as an alias for log would work... [12:15] Odd_Bloke: but you're not really reading a log, which in my mind is a secondary piece of information about events [12:16] you're seeing the *history*, the main purpose of the rcs [12:16] okay, i'm going with "revision log" [12:16] schierbeck: Sure, I was just filling in the 'well, some'. :p [12:17] :) [12:17] sorry, i easily get very involved in silly matters [12:18] schierbeck: are these the changes that you wanted to make against vizchanges: https://code.launchpad.net/~dasch/bzr-gtk/viz-cleanup [12:18] ? [12:18] I suppose 'log' is also a more obvious/convenient shorthand than 'his' or 'hist'... [12:18] GaryvdM: that's another branch [12:18] i was working on a general cleanup of viz, but then i heard of your branch [12:19] that made some of my changes redundant [12:19] that's the reason why we set up that mailing list: to avoid redundancy :) [12:19] i really feel there's a lot of code duplication in there; i'd like to have a reference to the currently selected revision stored in the tree model [12:20] phanatic: yeah, but i've been having some trouble with it; didn't receive your mail, either :( [12:21] the branch's pushed to http://bazaar.launchpad.net/~dasch/bzr-gtk/viz-change-window-title [12:21] schierbeck: that sucks :( [12:21] i of course made a typo in the commit msg [12:21] i'll try to send a mail to the list [12:21] schierbeck: not even in your spam folder? [12:21] nope [12:21] it freaks me out [12:21] weird === Vantage13 [n=Vantage@www.toddcharron.com] has joined #bzr [12:24] wow, that's like the third "change title" mail i've sent to the list [12:24] first two were dupes [12:24] okay, it's off [12:25] i hate the list archive [12:25] it displays my message as a reply to another mail [12:26] phanatic: Do you have access to modify this page: https://launchpad.net/bzr-gtk/ ? [12:26] If you do, may I suggest adding a link to the mailing list. [12:29] Hmm - never mind - it seems I have access :-) [12:30] schierbeck: I received you list mail. [12:30] great :) [12:30] please do tell here if you reply; i'm not sure i'll receive it [12:34] GaryvdM: thanks for updating the page (i've been away from my computer for a bit) [12:34] NP === phanatic_ [n=phanatic@3e44adce.adsl.enternet.hu] has joined #bzr === phanatic_ is now known as phanatic [12:37] i've played around with vizchanges -- isn't the window getting *very* wide? [12:37] it's caused primarily by the new "Children" label [12:38] Does bazaar have a way of pulling multiple patches or merging multiple branches at once? [12:40] Vantage13 - Yes - you can merge multiple branches/patches in one commit [12:40] for example, if I have multiple features for one release. I'd like to just pull a release rather than have to pull each feature in individually [12:40] GaryvdM: how would you go about doing that? [12:41] bzr merge branch1 [12:41] bzr merge branch2 [12:41] bzr merge patch [12:41] bzr commit [12:41] GaryvdM: i'm not sure you can merge if you have uncommitted changes... [12:42] GaryvdM: is patch a command or just the name of the combination of the two? [12:42] test> bzr merge ../viz-status-message/ [12:42] bzr: ERROR: Working tree "/home/daniel/Projects/bzr-gtk/test/" has uncommitted changes [12:42] No - you can specify a patch to the merge command [12:43] --force [12:44] luks: does --force have any destructive side effects? [12:44] in case of conflicts, you will probably end up in a confusing situation [12:44] but otherwise no, as far as I know === egx0r [n=gx0r@port1448.ds1-khk.adsl.cybercity.dk] has joined #bzr [01:01] Having trouble with the initial orginazation. If I have 5 sub-projects working seperately but under one major project, should I then make 1 project and 5 branches or 5 seperate projects, any hints? [01:02] egx0r: I would personally go for 5 separate projects. [01:02] (a branch and a project would be the same thing here I think). [01:03] unless you always need all of the sub-projects, and it is inconceivable that anyone would ever work on just one. === schierbeck [n=daniel@dasch.egmont-kol.dk] has joined #bzr [01:07] james_w: Good point. You can see my sub-projects as tasks in a project. Every task should work independently of each other, but they should all be under the same project. I hope this makes sense.. [01:07] phanatic: do you have any remarks on the viz-change-title patch? [01:08] schierbeck: are you sure that children are making the viz window wider? [01:08] It seems like it's the tree to me [01:09] GaryvdM: it's both, i guess [01:09] schierbeck: i like history better i think [01:09] phanatic: me too :D [01:09] GaryvdM: i'd like some of the columns to disappear, too [01:09] like the revno -- it should be in the logview [01:10] schierbeck, GaryvdM: as we've discussed before, i'd prefer to allow the user to set which columns s/he wants to see [01:10] logview? [01:10] logview is the bottom part, the details :) [01:11] phanatic: but that'll take some time to implement -- i'd really like to keep the viz simple until we can offer such an option to the user [01:11] GaryvdM: oh, yeah, the bottom :) [01:11] GaryvdM: also, we really should simplify the date format [01:12] displaying both weekday and timezone seems to be overkill... [01:12] Weekday - Yes, Timezone - maybe [01:13] GaryvdM: if we can, why not convert to local time format? [01:13] Yhea [01:13] i think i better file a bug report, otherwise i'll just forget all this... [01:14] I think stuff that is in the tree must be helpfull to locate a revision. [01:14] exactly [01:14] there should be nothing more [01:14] Yhea - Timezone does not help [01:15] Revision number would be usefull [01:15] I remember revision numbers [01:17] GaryvdM: i'd rather have a search box, then [01:17] type the revno, and be taken to the right revision immediately [01:18] That is all ready the case :-) [01:18] Click on the tree and type a number. === jml [n=jml@ppp121-44-213-76.lns1.hba1.internode.on.net] has joined #bzr [01:19] GaryvdM: cool! but not very intuitive for a new user... [01:20] i'd rather hide the column and have a search box instead [01:21] Cool [01:21] There must allready be some gtk applications that have a column selector. [01:22] There is on built into the mozilla xul tree. [01:22] But there does not seem to be one for gtk. [01:23] hmm [01:23] i'm not sure how to do it [01:24] GaryvdM, evolution, but it uses an ugly custom widget === asak [n=alexis@201-26-55-59.dsl.telesp.net.br] has joined #bzr === luisbg [n=d33p@ubuntu/member/luisbg] has joined #bzr [01:39] GaryvdM: i've fixed the time stamp format: http://bazaar.launchpad.net/~dasch/bzr-gtk/viz-date-format === Verterok [n=ggonzale@75-108-235-201.fibertel.com.ar] has joined #bzr [01:53] schierbeck: cool [01:56] moin [01:56] phanatic: merge material? [02:00] schierbeck: looks okay [02:00] schierbeck> [02:01] i left the format as it was in the bottom; should i change it there, too? [02:01] schierbeck: that code is now in a different file in vizchanges (treemodel.py) [02:01] hmm [02:02] should i make a patch for vizchanges? === lifeless [n=robertc@ppp245-86.static.internode.on.net] has joined #bzr [02:07] GaryvdM: i'll mail you the patch [02:07] cool [02:08] Thanks [02:09] sent :) [02:16] it's a bit late over here, so good night guys :) [02:17] The formated date will allways be 16 chars - so we can set the width-chars to 16 [02:17] Night phanatic === seanhodges_ [n=sean@90.240.81.130] has joined #bzr [02:36] Night === edalytical [n=eddie@student5584.student.nau.edu] has joined #bzr === duckx [n=Duck@tox.dyndns.org] has joined #bzr === Ng [n=cmsj@mairukipa.tenshu.net] has left #bzr [] === luisbg [n=d33p@ubuntu/member/luisbg] has joined #bzr === herzel [i=herzel@gateway/tor/x-e6b70e3b20a84584] has joined #bzr === Verterok [n=ggonzale@75-108-235-201.fibertel.com.ar] has left #bzr ["leaving.."] [03:55] Is there a howto on bzr-svn anywhere? The website seems to list features, downloads, caveats, etc., but no instructions on use. === elijah tries a bunch of 'bzr svn ' commands, without much luck [03:58] elijah: The idea is that you use bzr normally but with svn URLs instead of bzr URLs [03:58] oh [03:58] elijah: so e.g. "bzr branch svn://..." should work [03:58] For http you might have to prefix with "svn+http://", but that may not be necessary any more, I don't remember. [03:58] ah, and the works-in-an-svn checkout means I just do 'bzr status' and it'll work the same as 'svn status'...yes? [03:59] well, no :) === elijah tries [03:59] it'll be a bzr status [03:59] well, yes [03:59] but very similar commands with similar status [03:59] yeah, only slightly different output === AfC [i=andrew@office.syd.operationaldynamics.com] has joined #bzr === lifeless [n=robertc@ppp245-86.static.internode.on.net] has joined #bzr === marianom [n=marianom@ubuntu/member/marianom] has left #bzr [] === lifeless [n=robertc@ppp245-86.static.internode.on.net] has joined #bzr === herzel104 [i=herzel@gateway/tor/x-e0d899b920b08961] has joined #bzr === jml [n=jml@ppp121-44-213-76.lns1.hba1.internode.on.net] has joined #bzr === sm [n=sm@pool-71-165-239-222.lsanca.dsl-w.verizon.net] has joined #bzr [08:59] good evening all [09:00] afternoon [09:01] could someone straighten me out on the current naming of bazaar|bzr[-ng] ? I am dreadfully confused [09:01] are there still two projects ? [09:03] next question: I just committed and see my email address in the log in bad.. can I uncommit and do it again ? [09:03] and how do I influence the email address bazaar picks ? [09:04] fourthly, if we get that far, how would I typically push what I've committed to the upstream developer ? [09:05] (or have I done that already ? not sure) [09:15] I see the answer to configuring email address, in the (excellent) man page [09:17] excellent.. uncommit, just like darcs unrecord [09:46] sm: The old, abandoned project (baz) is just called "baz" now. The new project is called Bazaar (bzr). [09:47] sm: The old project used to be called "Bazaar" and the new project used to be called "Bazaar-NG". [09:47] Hmm, "baz" is easier to type than "bzr". [09:47] Of course, "hg" beats them both at that. :P === fullermd makes a note to name his VCS 'asdf'. [09:48] What about Dvorak? [09:48] Their problem, not mine :p [09:49] aoeu, I guess. [09:49] thanks [09:49] You could make a symlink. === khayashi [n=khayashi@i60-34-114-168.s04.a013.ap.plala.or.jp] has joined #bzr === zyga [n=zyga@ubuntu/member/zyga] has joined #bzr [10:59] sm: yes you can uncommit [11:00] Except that if you're thinking darcs-ish, uncommitting something other than the latest rev is probably not going to do what you expect. [11:00] sm: you can either push if you have write access to their public branch. [11:00] otherwise use 'bzr send --mail-to their@address' [11:00] (assuming you have a fairly recent bzr' [11:00] excellent.. I'll try [11:02] not new enough I think.. bzr 0.15 in ubuntu feisty [11:03] Well, that should have the old 'bundle' at least. You can attach that to an email manually (me, I do it manual all around anyway) [11:12] fullermd: thanks, that worked [11:12] changes made, committed and sent.. mission accomplished [11:12] Now, on to world domination. [11:13] muhahaHAHA [11:13] the world should switch to darcs/bazaar/mercurial methinks [11:14] Well, when I'm elected Emperor... === jrydberg [n=Johan@c80-216-246-123.bredband.comhem.se] has joined #bzr === NamNguyen [n=NamNguye@cm38.delta196.maxonline.com.sg] has joined #bzr === zyga [n=zyga@ubuntu/member/zyga] has joined #bzr === pbor [n=urk@host134-85-dynamic.0-87-r.retail.telecomitalia.it] has joined #bzr === probablydrew [n=drew@ip72-211-146-73.tc.ph.cox.net] has joined #bzr === bac [n=bac@canonical/launchpad/bac] has joined #bzr === Mez_ [n=Mez@ubuntu/member/mez] has joined #bzr === Gwaihir [n=Gwaihir@ubuntu/member/gwaihir] has joined #bzr === theAdib [n=theAdib@dslb-088-074-132-054.pools.arcor-ip.net] has joined #bzr === phanatic [n=phanatic@3e44adce.adsl.enternet.hu] has joined #bzr === Mez_ is now known as Mez === gabe [n=gabriel@91.84.56.254] has joined #bzr === hackter [n=dboucard@mna75-6-82-229-33-118.fbx.proxad.net] has joined #bzr === nir [n=nir@moinmoin/fan/nir] has joined #bzr === juliank [n=juliank@f048224092.adsl.alicedsl.de] has joined #bzr === _logger_ [n=_logger@adsl-75-51-62-134.dsl.chcgil.sbcglobal.net] has joined #bzr === AfC [i=andrew@office.syd.operationaldynamics.com] has joined #bzr === BjornT_ [n=bjorn@ip-213-190-55-148.static.b4net.lt] has joined #bzr === BjornT [n=bjorn@canonical/launchpad/BjornT] has joined #bzr === BjornT [n=bjorn@canonical/launchpad/BjornT] has joined #bzr === hackter [n=dboucard@mna75-6-82-229-33-118.fbx.proxad.net] has joined #bzr === theAdib [n=theAdib@dslb-088-074-162-110.pools.arcor-ip.net] has joined #bzr === juliank [n=juliank@f048224092.adsl.alicedsl.de] has joined #bzr === bac [n=bac@canonical/launchpad/bac] has joined #bzr === fog [n=fog@debian/developer/fog] has joined #bzr === schierbeck [n=daniel@dasch.egmont-kol.dk] has joined #bzr [03:40] hi y'all === Gwaihir [n=Gwaihir@ubuntu/member/gwaihir] has joined #bzr === luks [n=lukas@unaffiliated/luks] has joined #bzr === cprov [n=cprov@canonical/launchpad/cprov] has joined #bzr === pete__c_ [n=pete@032-463-246.area7.spcsdns.net] has joined #bzr === cprov is now known as cprov-afk === khayashi [n=khayashi@i60-34-114-168.s04.a013.ap.plala.or.jp] has left #bzr [] === nir [n=nir@moinmoin/fan/nir] has joined #bzr === Zindar [n=erik@h188n1fls12o803.telia.com] has joined #bzr === pete__c [n=pete@032-467-575.area7.spcsdns.net] has joined #bzr === zyga [n=zyga@ubuntu/member/zyga] has joined #bzr === BjornT [n=bjorn@canonical/launchpad/BjornT] has joined #bzr === NamNguyen [n=NamNguye@cm38.delta196.maxonline.com.sg] has joined #bzr === Lo-lan-do [n=roland@mirenboite.placard.fr.eu.org] has joined #bzr === theAdib [n=theAdib@dslb-088-074-170-048.pools.arcor-ip.net] has joined #bzr [05:56] does bzr have an online interface? === pete__c [n=pete@032-467-575.area7.spcsdns.net] has joined #bzr === cypherbios [n=cyr@ubuntu/member/cypherbios] has joined #bzr [06:48] pbor: A web interface? There's Loggerhead (which is pretty heavy-weight, based on TurboGears) and there's also bzr-webserve (dunno how maintained it is). [06:50] pbor: Loggerhead powers http://codebrowse.launchpad.net/~bzr/bzr/trunk/files . === ubotu [n=ubotu@ubuntu/bot/ubotu] has joined #bzr [07:02] New bug: #147266 in bzr "Crash when getting log of remote branch using bzr+ssh" [Undecided,New] https://launchpad.net/bugs/147266 === BasicOSX [n=BasicOSX@75-161-171-16.mpls.qwest.net] has joined #bzr === schierbeck [n=daniel@dasch.egmont-kol.dk] has joined #bzr === Demitar [n=demitar@c-212-031-182-147.cust.broadway.se] has joined #bzr === phanatic [n=phanatic@dsl5400C45F.pool.t-online.hu] has joined #bzr === orospakr [n=orospakr@65.95.1.79] has joined #bzr === zyga [n=zyga@ubuntu/member/zyga] has joined #bzr === BjornT [n=bjorn@canonical/launchpad/BjornT] has joined #bzr === matkor [n=matkor@ip83-230-19-175.e-zabrze.pl] has joined #bzr === luks [n=lukas@unaffiliated/luks] has joined #bzr === zyga [n=zyga@ubuntu/member/zyga] has joined #bzr === schierbeck [n=daniel@dasch.egmont-kol.dk] has joined #bzr [09:58] hi guys [10:00] hi ! [10:05] morning === Mez_ [n=Mez@ubuntu/member/mez] has joined #bzr === Mez_ is now known as Mez === mw|out [n=mw@189.146.13.202] has joined #bzr [10:25] phanatic: ping [10:26] schierbeck: pong [10:26] :) [10:27] phanatic: any updates on the state of vizchanges? [10:28] schierbeck: i'll merge it tonight into trunk, so it gives green light to further changes :) [10:28] great! [10:29] it'll be much easier to make changes once it's merged [10:31] yep, i hope so :) === zyga [n=zyga@ubuntu/member/zyga] has joined #bzr === vila [n=vila@lec67-4-82-230-53-244.fbx.proxad.net] has joined #bzr === asak [n=alexis@201-27-61-160.dsl.telesp.net.br] has joined #bzr === fog [n=fog@debian/developer/fog] has left #bzr [] === clsk [n=clsk@unaffiliated/clsk] has joined #bzr === kslc [n=clsk@unaffiliated/clsk] has joined #bzr === jaguarondi_ [n=david@216.252-64-87.adsl-dyn.isp.belgacom.be] has joined #bzr === kslc [n=clsk@unaffiliated/clsk] has left #bzr ["Leaving"] === jml [n=jml@ppp121-44-213-76.lns1.hba1.internode.on.net] has joined #bzr