[12:03] <schierbeck> GaryvdM: hi
[12:04] <GaryvdM> hello
[12:04] <schierbeck> i just wanted to ask; do you accept somewhat unrelated patches to brokenlines?
[12:05] <schierbeck> it seems that it'll be merged soon, so i might as well place them there, to avoid any conflicts later on
[12:05] <schierbeck> (given that phanatic is in on it, of course)
[12:06] <GaryvdM> Yhea - I think you can make patches against vizchanges, and then send them to the list
[12:07] <GaryvdM> With a note that it is of vizchanges.
[12:07] <schierbeck> ok
[12:07] <GaryvdM> I think that is the best way to go.
[12:08] <GaryvdM> If you send them to the mailing list - I'll test them.
[12:08] <schierbeck> ok, thanks
[12:09] <schierbeck> GaryvdM: have i asked you about the title of the viz window?
[12:09] <GaryvdM> Like https://code.launchpad.net/~dasch/bzr-gtk/viz-cleanup ?
[12:09] <schierbeck> i'd like to rename it "Revision history"
[12:09] <GaryvdM> No
[12:09] <GaryvdM> Am\
[12:10] <GaryvdM> I agree that it needs to be changed
[12:10] <schierbeck> yup
[12:10] <schierbeck> okay, i'll make a quick patch and send it to the list
[12:10] <phanatic> if noone raises any objections on the list until tomorrow, i'll merge vizchanges/brokenlines
[12:10] <schierbeck> sweet
[12:10] <GaryvdM> Cool!
[12:11] <GaryvdM> I do like Revision History because it is consistent with previous vcs I have used.
[12:11] <GaryvdM> But in bzr it is Log
[12:12] <schierbeck> i know, but i just think that's unintuitive
[12:12] <GaryvdM> And I feel we should use that to be consistent.
[12:12] <schierbeck> hmm
[12:12] <schierbeck> i agree that it would be best
[12:13] <schierbeck> and using 'revision history' consistently would mean convincing the bzr guys it's for the better...
[12:13] <schierbeck> screw it, i'll use 'log'
[12:13] <GaryvdM> Else try get log changed to history in bzr ;-)
[12:13] <schierbeck> exactly :(
[12:14] <schierbeck> i don't know why they picked 'log' -- it really makes no sense
[12:14] <schierbeck> well, some
[12:14] <GaryvdM> And I think we need to add glog as a alias for viz
[12:14] <Odd_Bloke> Historical reasons and it is a log of revisions.
[12:15] <Odd_Bloke> Adding history as an alias for log would work...
[12:15] <schierbeck> Odd_Bloke: but you're not really reading a log, which in my mind is a secondary piece of information about events
[12:16] <schierbeck> you're seeing the *history*, the main purpose of the rcs
[12:16] <schierbeck> okay, i'm going with "revision log"
[12:16] <Odd_Bloke> schierbeck: Sure, I was just filling in the 'well, some'. :p
[12:17] <schierbeck> :)
[12:17] <schierbeck> sorry, i easily get very involved in silly matters
[12:18] <GaryvdM> schierbeck: are these the changes that you wanted to make against vizchanges: https://code.launchpad.net/~dasch/bzr-gtk/viz-cleanup
[12:18] <GaryvdM> ?
[12:18] <Odd_Bloke> I suppose 'log' is also a more obvious/convenient shorthand than 'his' or 'hist'...
[12:18] <schierbeck> GaryvdM: that's another branch
[12:18] <schierbeck> i was working on a general cleanup of viz, but then i heard of your branch
[12:19] <schierbeck> that made some of my changes redundant
[12:19] <phanatic> that's the reason why we set up that mailing list: to avoid redundancy :)
[12:19] <schierbeck> 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] <schierbeck> phanatic: yeah, but i've been having some trouble with it; didn't receive your mail, either :(
[12:21] <schierbeck> the branch's pushed to http://bazaar.launchpad.net/~dasch/bzr-gtk/viz-change-window-title
[12:21] <phanatic> schierbeck: that sucks :(
[12:21] <schierbeck> i of course made a typo in the commit msg
[12:21] <schierbeck> i'll try to send a mail to the list
[12:21] <phanatic> schierbeck: not even in your spam folder?
[12:21] <schierbeck> nope
[12:21] <schierbeck> it freaks me out
[12:21] <phanatic> weird
[12:24] <schierbeck> wow, that's like the third "change title" mail i've sent to the list
[12:24] <schierbeck> first two were dupes
[12:24] <schierbeck> okay, it's off
[12:25] <schierbeck> i hate the list archive
[12:25] <schierbeck> it displays my message as a reply to another mail
[12:26] <GaryvdM> phanatic: Do you have access to modify this page: https://launchpad.net/bzr-gtk/ ?
[12:26] <GaryvdM> If you do, may I suggest adding a link to the mailing list.
[12:29] <GaryvdM> Hmm - never mind -  it seems I have access :-)
[12:30] <GaryvdM> schierbeck: I received you list mail.
[12:30] <schierbeck> great :)
[12:30] <schierbeck> please do tell here if you reply; i'm not sure i'll receive it
[12:34] <phanatic> GaryvdM: thanks for updating the page (i've been away from my computer for a bit)
[12:34] <GaryvdM> NP
[12:37] <schierbeck> i've played around with vizchanges -- isn't the window getting *very* wide?
[12:37] <schierbeck> it's caused primarily by the new "Children" label
[12:38] <Vantage13> Does bazaar have a way of pulling multiple patches or merging multiple branches at once?
[12:40] <GaryvdM> Vantage13 - Yes - you can merge multiple branches/patches in one commit
[12:40] <Vantage13> 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] <Vantage13> GaryvdM: how would you go about doing that?
[12:41] <GaryvdM> bzr merge branch1
[12:41] <GaryvdM> bzr merge branch2
[12:41] <GaryvdM> bzr merge patch
[12:41] <GaryvdM> bzr commit
[12:41] <schierbeck> GaryvdM: i'm not sure you can merge if you have uncommitted changes...
[12:42] <Vantage13> GaryvdM: is patch a command or just the name of the combination of the two?
[12:42] <schierbeck> test> bzr merge ../viz-status-message/
[12:42] <schierbeck> bzr: ERROR: Working tree "/home/daniel/Projects/bzr-gtk/test/" has uncommitted changes
[12:42] <GaryvdM> No - you can specify a patch to the merge command
[12:43] <luks> --force
[12:44] <schierbeck> luks: does --force have any destructive side effects?
[12:44] <luks> in case of conflicts, you will probably end up in a confusing situation
[12:44] <luks> but otherwise no, as far as I know
[01:01] <egx0r> 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] <james_w> egx0r: I would personally go for 5 separate projects.
[01:02] <james_w> (a branch and a project would be the same thing here I think).
[01:03] <james_w> unless you always need all of the sub-projects, and it is inconceivable that anyone would ever work on just one.
[01:07] <egx0r> 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] <schierbeck> phanatic: do you have any remarks on the viz-change-title patch?
[01:08] <GaryvdM> schierbeck: are you sure that children are making the viz window wider?
[01:08] <GaryvdM> It seems like it's the tree to me
[01:09] <schierbeck> GaryvdM: it's both, i guess
[01:09] <phanatic> schierbeck: i like history better i think
[01:09] <schierbeck> phanatic: me too :D
[01:09] <schierbeck> GaryvdM: i'd like some of the columns to disappear, too
[01:09] <schierbeck> like the revno -- it should be in the logview
[01:10] <phanatic> 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] <GaryvdM> logview?
[01:10] <phanatic> logview is the bottom part, the details :)
[01:11] <schierbeck> 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] <schierbeck> GaryvdM: oh, yeah, the bottom :)
[01:11] <schierbeck> GaryvdM: also, we really should simplify the date format
[01:12] <schierbeck> displaying both weekday and timezone seems to be overkill...
[01:12] <GaryvdM> Weekday - Yes, Timezone - maybe
[01:13] <schierbeck> GaryvdM: if we can, why not convert to local time format?
[01:13] <GaryvdM> Yhea
[01:13] <schierbeck> i think i better file a bug report, otherwise i'll just forget all this...
[01:14] <GaryvdM> I think stuff that is in the tree must be helpfull to locate a revision.
[01:14] <schierbeck> exactly
[01:14] <schierbeck> there should be nothing more
[01:14] <GaryvdM> Yhea - Timezone does not help
[01:15] <GaryvdM> Revision number would be usefull
[01:15] <GaryvdM> I remember revision numbers
[01:17] <schierbeck> GaryvdM: i'd rather have a search box, then
[01:17] <schierbeck> type the revno, and be taken to the right revision immediately
[01:18] <GaryvdM> That is all ready the case :-)
[01:18] <GaryvdM> Click on the tree and type a number.
[01:19] <schierbeck> GaryvdM: cool! but not very intuitive for a new user...
[01:20] <schierbeck> i'd rather hide the column and have a search box instead
[01:21] <GaryvdM> Cool
[01:21] <GaryvdM> There must allready be some gtk applications that have a column selector.
[01:22] <GaryvdM> There is on built into the mozilla xul tree.
[01:22] <GaryvdM> But there does not seem to be one for gtk.
[01:23] <schierbeck> hmm
[01:23] <schierbeck> i'm not sure how to do it
[01:24] <luks> GaryvdM, evolution, but it uses an ugly custom widget
[01:39] <schierbeck> GaryvdM: i've fixed the time stamp format: http://bazaar.launchpad.net/~dasch/bzr-gtk/viz-date-format
[01:53] <GaryvdM> schierbeck: cool
[01:56] <Verterok> moin
[01:56] <schierbeck> phanatic: merge material?
[02:00] <phanatic> schierbeck: looks okay
[02:00] <GaryvdM> schierbeck>
[02:01] <schierbeck> i left the format as it was in the bottom; should i change it there, too?
[02:01] <GaryvdM> schierbeck: that code is now in a different file in vizchanges (treemodel.py)
[02:01] <schierbeck> hmm
[02:02] <schierbeck> should i make a patch for vizchanges?
[02:07] <schierbeck> GaryvdM: i'll mail you the patch
[02:07] <GaryvdM> cool
[02:08] <GaryvdM> Thanks
[02:09] <schierbeck> sent :)
[02:16] <phanatic> it's a bit late over here, so good night guys :)
[02:17] <GaryvdM> The formated date will allways be 16 chars - so we can set the width-chars to 16
[02:17] <GaryvdM> Night phanatic
[02:36] <GaryvdM> Night
[03:55] <elijah> Is there a howto on bzr-svn anywhere?  The website seems to list features, downloads, caveats, etc., but no instructions on use.
[03:58] <radix> elijah: The idea is that you use bzr normally but with svn URLs instead of bzr URLs
[03:58] <elijah> oh
[03:58] <radix> elijah: so e.g. "bzr branch svn://..." should work
[03:58] <radix> For http you might have to prefix with "svn+http://", but that may not be necessary any more, I don't remember.
[03:58] <elijah> 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] <radix> well, no :)
[03:59] <radix> it'll be a bzr status
[03:59] <elijah> well, yes
[03:59] <elijah> but very similar commands with similar status
[03:59] <elijah> yeah, only slightly different output
[08:59] <sm> good evening all
[09:00] <harrisony> afternoon
[09:01] <sm> could someone straighten me out on the current naming of bazaar|bzr[-ng]  ? I am dreadfully confused
[09:01] <sm> are there still two projects ?
[09:03] <sm> next question: I just committed and see my email address in the log in bad.. can I uncommit and do it again ?
[09:03] <sm> and how do I influence the email address bazaar picks ?
[09:04] <sm> fourthly, if we get that far, how would I typically push what I've committed to the upstream developer ?
[09:05] <sm> (or have I done that already ? not sure)
[09:15] <sm> I see the answer to configuring email address, in the (excellent) man page
[09:17] <sm> excellent.. uncommit, just like darcs unrecord
[09:46] <Peng> sm: The old, abandoned project (baz) is just called "baz" now. The new project is called Bazaar (bzr).
[09:47] <Peng> sm: The old project used to be called "Bazaar" and the new project used to be called "Bazaar-NG".
[09:47] <Peng> Hmm, "baz" is easier to type than "bzr".
[09:47] <Peng> Of course, "hg" beats them both at that. :P
[09:48] <Peng> What about Dvorak?
[09:48] <fullermd> Their problem, not mine   :p
[09:49] <Peng> aoeu, I guess.
[09:49] <sm> thanks
[09:49] <Peng> You could make a symlink.
[10:59] <james_w> sm: yes you can uncommit
[11:00] <fullermd> 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] <james_w> sm: you can either push if you have write access to their public branch.
[11:00] <james_w> otherwise use 'bzr send --mail-to their@address'
[11:00] <james_w> (assuming you have a fairly recent bzr'
[11:00] <sm> excellent.. I'll try
[11:02] <sm> not new enough I think.. bzr 0.15 in ubuntu feisty
[11:03] <fullermd> 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] <sm> fullermd: thanks, that worked
[11:12] <sm> changes made, committed and sent.. mission accomplished
[11:12] <fullermd> Now, on to world domination.
[11:13] <sm> muhahaHAHA
[11:13] <sm> the world should switch to darcs/bazaar/mercurial methinks
[11:14] <fullermd> Well, when I'm elected Emperor...
[03:40] <schierbeck> hi y'all
[05:56] <pbor> does bzr have an online interface?
[06:48] <Peng> 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] <Peng> pbor: Loggerhead powers http://codebrowse.launchpad.net/~bzr/bzr/trunk/files .
[07:02] <ubotu> New bug: #147266 in bzr "Crash when getting log of remote branch using bzr+ssh" [Undecided,New]  https://launchpad.net/bugs/147266
[09:58] <schierbeck> hi guys
[10:00] <matkor> hi !
[10:05] <thumper> morning
[10:25] <schierbeck> phanatic: ping
[10:26] <phanatic> schierbeck: pong
[10:26] <schierbeck> :)
[10:27] <schierbeck> phanatic: any updates on the state of vizchanges?
[10:28] <phanatic> schierbeck: i'll merge it tonight into trunk, so it gives green light to further changes :)
[10:28] <schierbeck> great!
[10:29] <schierbeck> it'll be much easier to make changes once it's merged
[10:31] <phanatic> yep, i hope so :)