[00:50] <maxb> Does anyone use Bazaar to version Java projects built with Maven?
[01:18] <awilkins> maxb, I do
[01:18] <awilkins> maxb, Oh ,wait, I version the sources
[01:18] <awilkins> maxb, Not the outputs
[01:42] <offby1> maxb: geez, you're in every revision-control channel! :)
[03:56]  * igc lunch
[03:58]  * mwhudson stares at bzr for setting BZR_HOME to a unicode string in a test case
[04:03] <mwhudson> hmm, seems r4707.1.1 is at fault
[04:05] <idnar> nice
[05:38] <poolie1> igc, hi?
[05:38] <igc> hi poolie1
[05:38] <poolie1> hi
[05:38] <poolie1> i thought we could try to get sphinx going
[05:38] <igc> poolie1: +1 from me
[05:38] <poolie1> i just need to find where they installed this thing
[05:39] <igc> poolie1: 35067 is the rt# if that helps
[05:40] <poolie1> k
[05:40] <poolie1> i always get confused between pchroot schroot and dchroot :)
[05:41] <poolie1> ie 3 implementations of more or less the same thing
[05:41] <poolie1> anyhow i have the mail
[05:41] <lifeless> dchroot is now just wrapper of schroot
[05:42] <poolie1> heh
[05:42] <poolie1> I have no name!@escudero:/$ exit
[05:44] <poolie1> igc: so you should be able to run
[05:44] <poolie1> dchroot -c karmic
[05:44] <poolie1> then sphinx-build seems to work
[05:44] <poolie1> the environment is a bit rough and ready though - no /etc/passwd, hence the message i pasted above
[05:47] <igc> poolie1: so dchroot -d karmic works for me
[05:47] <poolie1> ok
[05:47] <igc> where/how do you want to build things?
[05:47] <poolie1> i'm just going to try going into a current checkout and building the docs there
[05:47] <poolie1> it builds them under my home directory at the moment
[05:47] <poolie1> but that's not available inside the chroot
[05:47] <igc> poolie1: can we start small?
[05:48] <igc> bzr+ssh://bazaar.launchpad.net/~bzr/bzr-alldocs/trunk/
[05:48] <poolie1> what do you have in mind?
[05:48] <igc> this is the wrapper site over doc.bazaar-vcs.org/en, ru and the other languages
[05:48] <poolie1> oh ok
[05:49] <igc> I just added the bzr team tracker to these a few minutes ago
[05:49] <poolie1> and how do i build things inside it?
[05:49] <poolie1> checked out to /srv/bazaar.canonical.com/doc/alldocs
[05:49] <poolie1> "team tracker"?
[05:49] <igc> pull the branch, then run the magic script ...
[05:51] <poolie1> http://doc.bazaar-vcs.org/alldocs/_build/en/  <--- woo
[05:51] <igc> poolie1: the magic script is build_sites.py as you probably seen by now
[05:51] <poolie1> yep, done, and the results are in that url
[05:52] <poolie1> it looks good to me, what do you think?
[05:52] <poolie1> is there meant to be an html file above the /en/ directory?
[05:53] <igc> poolie1: something not quite right ...
[05:53] <igc> did you get rev 26?
[05:54] <igc> poolie1: maybe we just need to reset the sym links to point to the new build locations?
[05:54] <igc> instead of into my home area?
[05:54] <poolie1> i do have r26
[05:55] <poolie1> which symlinks? there don't seem to be any in the tree
[05:56] <igc> poolie1: ok. (confused with other bits)
[05:56]  * igc keeps looking
[05:57] <poolie1> the other questions are: is:
[05:57] <poolie1> at what url do we eventually want this to appear
[05:57] <poolie1> and how should it mesh with the docs that are already there
[05:58] <igc> poolie1: ok. /en is a copy, not a link to the site
[05:58] <igc> so we could change that or ...
[05:58] <igc> change the build script to copy to the right place
[05:59] <igc> poolie1: I think linking is ok
[05:59] <poolie1> doc.b.o/en is the old version uploaded by you
[06:00] <poolie1> i haven't changed it yet
[06:00] <igc> poolie: answering your Qs ...
[06:00] <poolie1> as you said, small steps
[06:00] <igc> doc.b.o/en, doc.b.o/es, etc. all need to point into the area you just built
[06:00] <poolie1> ok
[06:00] <poolie1> what do we want to have at the top level of the site
[06:01] <poolie1> like under doc.b.o/
[06:01] <poolie1> no change for now?
[06:01] <igc> poolie1: right now, let's leave it as is
[06:01] <igc> poolie1: it's helpful for users wanting to find a particular version ...
[06:01] <igc> e.g. 2.0.0 when 2.0.1 is out
[06:02] <igc> the en/ru/etc pages don't reveal *every* old version, just the latest point release of old versions
[06:02] <poolie1> right
[06:02] <poolie1> how do they know which versions to link in?
[06:03] <poolie1> ideally they wouldn't have to be updated on every release
[06:03] <igc> poolie1: the en/etc pages link to logical names ...
[06:03] <igc> latest, test, development
[06:05] <igc> poolie1: I update the symlinks when new versions roll out currently
[06:05] <igc> (after rebuilding docs, uploading them, editing the cover sites, uploading them, etc.)
[06:05] <poolie1> ok
[06:05] <igc> (it's a pain)
[06:05] <poolie1> maybe we can automate that more separately
[06:05] <poolie1> so
[06:06] <poolie1> could you please login, run 'umask 2' to make things you touch group writable
[06:06] <poolie1> then move the en fr ja ru docs into old-sphinx
[06:06] <poolie1> and then we can try making symlinks into alldocs
[06:07] <igc> umask 2 done
[06:07] <igc> poolie1: en etc moved
[06:08] <igc> poolie1: you doing the new links?
[06:08] <poolie1> yes
[06:08] <poolie1> you'd just made the old ones unwritable by anyone else
[06:08] <poolie1> and i don't have sudo so i needed you to move them
[06:08] <poolie1> thanks
[06:09] <poolie1> k http://doc.bazaar-vcs.org/en/ looks good now?
[06:09] <igc> yep - sweet
[06:09] <igc> just tried View>Page Source and I see the new JavaScript
[06:09] <poolie1> how are you meant to reach the non-english versions?
[06:09] <poolie1> great
[06:09] <igc> links at bottom of page
[06:09] <igc> to other languages
[06:10] <igc> see them?
[06:10] <igc> all tested ok
[06:11] <igc> poolie1:^
[06:12] <poolie1> ah ok i see it
[06:12] <poolie1> i overlooked it
[06:12] <poolie1> imbn if it was in the footer on somewhere that's more clearly meta-content

[06:13] <poolie1> that looks good
[06:14] <igc> poolie1: so the next 3 simple ones are ...
[06:14] <poolie1> igc, the script that built the old documentation has some code to determine the right versions
[06:14] <poolie1> we could glue that in
[06:14] <igc> migration, plugins and explorer
[06:15] <poolie1> ok, they're separate trees?
[06:15] <igc> poolie1: by glue, you mean generate the version numbers current in bzr_alldocs_conf.py?
[06:15] <poolie1> right
[06:16] <igc> sure
[06:16] <poolie1> or to do something to make it non-manual
[06:16] <poolie1> are the migration, plugins and explorer things separate trees like this?
[06:16] <igc> sphinx may even let us see them on the command line if that helps
[06:16] <poolie1> i'm at spiv's house now and i need to go home from here in a sec
[06:16] <igc> yes, different trees
[06:16] <poolie1> i'm just going to setup a cronjab
[06:16] <poolie1> job*
[06:16] <igc> :-)
[06:16] <poolie1> could you mail me the branches?
[06:16] <igc> die cron die
[06:16] <igc> :-)
[06:17] <igc> sure
[06:17] <igc> thanks btw
[06:17] <igc> I'll email you now
[06:17] <igc> poolie1:^
[06:17] <poolie1> np, thanks for setting it up
[06:17] <igc> say hi to spiv
[06:17] <spiv> igc: hi :)
[06:18] <igc> poolie1: it looks good, it just fiddly to maintain
[06:18] <igc> this will help
[06:18] <igc> hi spiv!
[06:18] <poolie1> k cronjob seems to work
[06:19] <poolie1> now we'll see how many errors turn up when it really runs :)
[06:19] <igc> :-)
[06:55] <vila> hi al
[06:55] <vila> all even
[07:11] <Peng> Hi. :) Though I'm probably about to go AFK. :P
[08:04] <Glenjamin> hey guys, does anyone know a good way of getting an application shortcut to bzr explorer on mac os x?
[08:07] <vila> Glenjamin: send a patch ? :-D
[08:07] <Glenjamin> ?
[08:08] <vila> Glenjamin: kidding, try getting in touch with igc
[08:09] <vila> 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] <Glenjamin> just a shortcut with an icon to run bzr explorer
[08:10] <Glenjamin> the guide recommends I make one and pin it to the dock, but doesn't say how to
[08:10] <vila> ohhh, that kind of short-cut, sry. I can't help here, I haven't installed bzr explorer on my mac
[08:18] <igc> Glenjamin: try emailing the bzr-mac list for input. See https://launchpad.net/~bzr-mac
[08:18] <Glenjamin> ah, ta -  I was just posting a question on the bzr-explorer page :)
[08:26] <igc> night all - have a good weekend
[08:27] <spiv> igc: g'night
[08:27] <vila> g'night Ian
[09:18] <leo> hello, looking for some help with loggerhead
[09:51] <Peng> Oh thank goodness leo left, I was just checking IRC before going to bed. :P
[14:56] <MTecknology> 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] <vila> MTecknology: --remember ftw !
[14:58] <MTecknology> vila: thanks :)
[16:11] <bialix> hi GaryvdM
[16:11] <GaryvdM> Hi Alex
[16:11] <bialix> I can work on 0.14.5 today
[16:12] <GaryvdM> bialix: Cool - I just stared looking at it to.
[16:12] <bialix> 2 weeks ago we discussed what we want to backport from 0.15
[16:12] <bialix> I want to g through that list today
[16:12] <bialix> *go
[16:13] <bialix> feel free to mark any bug for backport
[16:13] <GaryvdM> Yes
[16:13] <bialix> cool
[16:13] <bialix> let's go :-)
[16:15]  * bialix likes bug-url command, thanks luks
[16:18] <visik7> anyone with bzr on windows ?
[16:18] <bialix> what?
[16:18] <visik7> I need to test a little thing
[16:18]  * sidnei raises hand
[16:18] <sidnei> i would have to restart though :(
[16:19] <visik7> what bzrlib.user_encoding returns ?
[16:19]  * bialix on windows but a bit busy
[16:19] <visik7> I mean the exact string
[16:19] <bialix> visik7: it returns ANSI encoding
[16:19] <visik7> yes but could you run it and tell my your ?
[16:19] <bialix> visik7: it depends on current user settings
[16:19] <visik7> I know
[16:19] <bialix> for me (Russian) it's cp1251
[16:19] <visik7> and is there a way to get this encoding without bzrlib ?
[16:19] <jam> visik7: I'm also on windows, what was the original question?
[16:20] <bialix> for US/Western Europe I believe it's cp1252
[16:20] <visik7> jam I'm tring to remove the bzr dependancies from a program that use bzrlib to get the current encoding
[16:20] <bialix> visik7: do you mean via python?
[16:20] <visik7> yes
[16:20] <jam> visik7: if you look at bzrlib/osutils.py it has the details of how we determine the encoding
[16:20] <jam> something like
[16:20] <bialix> look at the code
[16:20] <jam> import locale; locale.getpreferredencoding()
[16:21] <jam> though there is also
[16:21] <jam> sys.getfilesystemencoding()
[16:21] <jam> and stuff to determine the terminal encoding
[16:21] <visik7> thanks
[16:21] <jam> all different
[16:21] <bialix> hi jam
[16:21] <visik7> the FS enc is ok
[16:21] <jam> filesystem is usually 'mbcs', locale is usually latin-1, and terminal is cp???
[16:22] <bialix> latin-1 == cp1251?
[16:22] <bialix> cp1252, rats
[16:22] <visik7> bzrlib use terminal locale or fs ?
[16:22] <visik7> I look the code
[16:23] <jam> visik7: fs encoding for *filenames*, locale for the *content* of files (generally)
[16:23] <jam> and terminal for the way to format bytes for display on the screen
[16:23] <jam> of course, on reasonable systems *all* of those are "utf-8" :)
[16:23] <bialix> windows supports unicode for filenames, no need to use fs encoding, it's always mbcs anyway
[16:35] <bialix> GaryvdM: I think I've marked all bugs I know: https://launchpad.net/qbzr/+milestone/0.14.5
[16:37] <GaryvdM> bialix: cool - I'm going to to the tag one now
[16:37] <bialix> GaryvdM: I'm porting qsubprocess --bencode
[16:39] <GaryvdM> bialix: I did push uncommit commit push on lp:qbzr/0.14, so you may need to do pull --overwrite
[16:39] <GaryvdM> bialix: err - no - you beat me to the second push never mind
[16:39] <bialix> ok
[16:46] <jam> 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] <mthaddon> jam: sure
[16:46] <jam> spm created it for me last night, and I didn't notice until today
[16:46] <jam> mthaddon: if you want to just "bzr push" to force it to update, that would be fine with me
[16:46] <mthaddon> jam: from current lp:bzr ?
[16:47] <jam> mthaddon: yeah
[16:52] <mthaddon> jam: revno 4778
[16:52] <jam> thx
[16:52] <mthaddon> done
[16:55] <corp186> I accidentally pushed the wrong branch to a new lp branch
[16:56] <corp186> how do I revert the lp branch back to the initial state?
[16:56] <bialix> GaryvdM: I see there is all green now
[16:57] <bialix> rats
[16:57] <bialix> corp186: re-push with --overwrite flag
[16:57] <corp186> bialix: I get "No new revisions to push."
[16:58] <bialix> you wrote: corp186>	I accidentally pushed the wrong branch to a new lp branch
[16:58] <bialix> do you have copy of original "right" branch
[16:58] <bialix> ?
[16:58] <corp186> ahh, I see what you're saying
[16:58] <corp186> yeah
[16:58] <bialix> cd to "right" branch and push --overwrite
[16:59] <corp186> bialix: thanks, that worked
[17:00] <bialix> always happy to help (c) jam
[17:00] <bialix> :-)
[17:11] <GaryvdM> 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] <GaryvdM> And - messages that I have sent don't appear there. No wonder no one answers my questions some times.
[17:14] <bialix> Garyvdm: I've backport all revno I remember
[17:14] <bialix> I see you finished too
[17:14] <GaryvdM> Yes
[17:15] <GaryvdM> bialix: When you are idle, check this out: http://garyvdm.googlepages.com/out.ogv
[17:15] <GaryvdM> Bialix: rename in qbrowse/qcommit
[17:15]  * bialix opens link
[17:15] <GaryvdM> 1.1mb
[17:16] <bialix> Garyvdm: I'll wait till tomorrow morning to cut tarball, ok?
[17:16] <bialix> GaryvdM: what is ogv?
[17:16] <GaryvdM> Ok - I'm going to do some hacking  - on drag and drop move
[17:16] <GaryvdM> ogg video
[17:17] <GaryvdM> Best player on windows for that would be vlc
[17:17] <bialix> hmm, I hope K-lite codec pack knows how to play it
[17:18] <GaryvdM> Hi luks
[17:18] <bialix> GaryvdM: COOOOOOOOOOOOOOOOOOOOOL
[17:19] <GaryvdM> :-)
[17:19] <bialix> and how to move file? drag-n-drop?
[17:19] <GaryvdM> Yes - that's what I'm working on now.
[17:19] <luks> hey
[17:19] <bialix> oh, cool cool cool
[17:19] <bialix> heya luks
[17:20] <jelmer> hi *
[17:20] <jelmer> /topic Welcome in #qbzr ;-)
[17:20] <GaryvdM> And for --after - you will be able to select a missing, and a unversioned and chose mark as resolved
[17:20] <GaryvdM> Hi jelmer
[17:20] <bialix> heya jelmer
[17:20] <bialix> what's .topic?
[17:21] <bialix> what's /topic?
[17:21] <GaryvdM> 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] <GaryvdM>  /topic allows you to change that
[17:22] <bialix> ah, ok
[17:24] <bialix> jelmer: cool article about bzr-svn/git/hg
[17:25] <bialix> jelmer: we all hope on bzr-hg
[17:26] <bialix> GaryvdM: how you made that video?
[17:28] <GaryvdM> bialix: with gtk-recordMyDesktop
[17:28]  * bialix nods
[17:29] <GaryvdM> bialix: it very easy, but I think it is linux only.
[17:29]  * bialix nods
[17:33] <bialix> GaryvdM: everything ready to release, will do it tomorrow
[17:33] <GaryvdM> bialix: cool
[17:34] <bialix> I leave 0.16? for you
[17:34] <GaryvdM> bialix: I'm going to see where I can get to with move and rename, and release 0.16 on Sunday
[17:34] <GaryvdM> yes
[17:37] <jelmer> bialix: thanks
[17:37] <bialix> FTW!
[17:38] <bialix> 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] <bialix> GaryvdM: do you have any codename for 0.16 in mind?
[17:44] <GaryvdM> bialix: Sorry - no
[17:44] <GaryvdM> Lots of work in the Tree view
[17:44] <GaryvdM> *TreeWidget
[17:45] <jelmer> bialix: whatever happened to the work that rocky burton was doing?
[17:45] <bialix> what's nice tree in your region?
[17:45] <bialix> jelmer: rocky burton? sorry, I don't follow
[17:46] <bialix> GaryvdM: what's nice tree in your region? tree you like?
[17:46] <GaryvdM> bialix: http://en.wikipedia.org/wiki/Acacia
[17:47] <GaryvdM> http://savannaenvironment.files.wordpress.com/2008/04/acacia.jpg
[17:48] <bialix> GaryvdM: Acacia grew and here too
[17:48] <bialix> so let's use its name?
[17:48] <GaryvdM> I see - was just reading the Wikipedia article.
[17:49] <bialix> but in my region it has white flowers
[17:50] <bialix> I'll add Acacia as codename to 0.16, ok?
[17:51] <bialix> GaryvdM ^
[17:51] <GaryvdM> Cool
[17:51] <bialix> :-)
[18:03] <GaryvdM> bialix: are you using trunk?
[18:04] <bialix> right now I'm testing 0.14.5
[18:04] <bialix> I'm switching between both from time to time
[18:04]  * bialix is very busy with my main work
[18:05] <GaryvdM> bialix: Sure, I understand
[18:05] <GaryvdM> bialix: I'm looking for feedback on the new directory grouping in qcommit.
[18:06] <bialix> ok, I'll switch and will test it these days
[18:20] <bialix> Garyvdm: ping
[18:21] <GaryvdM> pong
[18:21] <bialix> Garyvdm: recently I've discovered that qlog FILE don't show revisions where file was removed
[18:22] <bialix> e.g. if you re-add file later
[18:22] <bialix> the same with plain log though
[18:22] <GaryvdM> bialix: yes - know bug, same in log
[18:22] <vila> bialix: hmm, lovely codename :-) I love Acacias, they can smell so good at times...
[18:22] <bialix> heya vila
[18:22] <bialix> GaryvdM: there is already bug?
[18:23] <GaryvdM> bialix: I think so - trying to find it.
[18:23] <bialix> vila: I have a misteriuos plan according to which we will name all qbzr releases after trees
[18:23] <GaryvdM> bialix: bug 181520
[18:24] <vila> lol
[18:24] <bialix> vila: but sometimes it make sense to use something funny
[18:24] <vila> bialix: That's quite  appropriate, there so many branches there :)
[18:24] <bialix> GaryvdM: lol, it's my bug
[18:25] <GaryvdM> bialix: I'm sure I also log a dup...
[18:25] <bialix> GaryvdM: I mean: can we fix it for qlog or it depends heavily on bzrlib behavior?
[18:25] <bialix> vila: :-D
[18:25] <fullermd> Isn't acacia technically a bush, not a tree?
[18:25] <bialix> GaryvdM: I have feeling that we have fixed it in the past
[18:26] <GaryvdM> 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] <GaryvdM> bialix: It would be easy to fix, but it would be slower.
[18:26] <bialix> :-/
[18:27] <bialix> fullermd: wikipedia said it's a group of shrubs and trees
[18:27] <vila> fullermd: hmm, well, there was one in my parent's home garden, it was a tree, definitely :)
[18:27] <bialix> fullermd: I saw only trees in my city
[18:27] <bialix> there is a lot of acacias
[18:28] <bialix> slower is bad word
[18:29] <GaryvdM> 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:30] <GaryvdM> Oh - sorry - thats a different bug.
[18:31] <bialix> GaryvdM: ok, so it's related to the fact file-graph missing deletion
[18:31] <bialix> GaryvdM: that bug looks ok
[18:32] <GaryvdM> 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] <GaryvdM> bialix: My bug is the one that would be easy to fix, but it would be slower.
[18:33] <bialix> ah, sorry, I misread
[18:34] <bialix> anybody knows about undelete plugin?
[18:35] <GaryvdM> 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] <bialix> GaryvdM: so, am I correct that this sort of info just missing in per-file-graph?
[18:36] <GaryvdM> bialix: yes
[18:36] <bialix> bad
[18:52]  * GaryvdM ventures out to seek food.
[19:28] <lau> hi, i am noobing here but any time i perform a modification on a file (local branch)
[19:28] <lau> i first have to bzr add before bzr commit ?
[19:32] <dereine> i need to replace lp: with the right url?
[19:32] <dereine> does someone know where lp points to?
[19:35] <Pilky> dereine: lp:project equates to bzr+ssh://bazaar.launchpad.net/~ownerOfMainBranch/project/mainbranchname
[19:35] <Pilky> dereine: eg lp:bazaarx equates to bzr+ssh://bazaar.launchpad.net/~bazaarx-dev/bazaarx/dev/
[19:35] <dereine> Pilky: thx
[19:36] <dereine> 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] <Pilky> dereine: in theory, yes
[19:38] <dereine> Pilky: is there a  public commando from the bzr commando?
[19:39] <Pilky> hmm? not sure what you mean
[19:39] <GaryvdM> lau: Only the first time the file is committed.
[19:40] <corp186> How can I delete a tag in a remote repository?
[19:40] <corp186> I know no one else has cloned the branch yet
[19:41] <GaryvdM> corp186: bzr tag --delete
[19:41] <GaryvdM> corp186: Then bzr push
[19:42] <lau> thx GaryvdM, i have a scenario i do not clearly understand
[19:42] <lau> 1- i bzr update from a lp bzr repo
[19:42] <corp186> GaryvdM: I even used bzr push --overwrite, but it still didn't delete the tag
[19:42] <lau> 2- i modify 2 files from my working dir
[19:43] <lau> 3- i bzr commit to lp bzr repo
[19:43] <lau> 4- it commits my 2 modified files _+ 2 others files w/ MERGE-SOURCE in them
[19:44] <lau> what could be the root cause of the MERGE-SOURCE text in these 2 files ? w/o any
[19:44] <lau> error during the bzr update ?
[19:45] <GaryvdM> corp186: maybe try bzr tag --delete -d url/to/remote
[19:45] <dereine> Pilky: perhaps "bzr get_path lp:foo"  would return the bzr+ssh.... url from the project to check out
[19:46] <GaryvdM> lau: What is the url of the branch on lp?
[19:46] <Pilky> 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] <Pilky> dereine: what exactly are you needing the URL for?
[19:46] <corp186> GaryvdM: -d did the trick, thanks :)
[19:46] <lau> GaryvdM: it is a personal project i prefer not to tell ? i really think it is my fault because
[19:46] <lau> i am noobing here ...
[19:47] <dereine> Pilky: awesome, i just don't need to transfer the url, just give bzr branch the url, thx for the eye-opener
[19:47] <Pilky> dereine: yeah, anywhere there is a path you can pass in an lp:foo eg to branch bzr itself you'd type
[19:47] <Pilky> bzr branch lp:bzr mylocalbranch
[19:48] <dereine> Pilky: would it be able to define own shortcuts?
[19:50] <Pilky> dereine: I believe so, but I'm not sure how. I think it may require a plugin to be written
[19:50] <GaryvdM> dereine, Pilky: bzr-bookmarks
[19:51] <GaryvdM> https://launchpad.net/bzr-bookmarks
[19:51] <dereine> thx
[20:00] <lau> GaryvdM: i think know that it was old trash from my working tree
[20:01] <lau> these 2 files with some MERGE-SOURCE and TREE in them
[20:01] <lau> without any .BASE, .THIS or .OTHER
[20:01] <lau> was a old remanation from my working tree, does it make sense ?
[20:01] <GaryvdM> Yes
[20:01] <GaryvdM> lau: You can uncommit, remove the cruft, and then commit again
[20:02] <GaryvdM> lau: If you use qcommit, it will remember the commit message for you.
[20:03] <lau> yes i did that thx
[20:03] <lau> what are the tools i can use in order to prevent this happen again ?
[20:04] <lau> i mean old dirty stuff in my working tree that i commit inadvertently ?
[20:04] <GaryvdM> lau: read the diff before you commit?
[20:04] <lau> :) right ok
[20:05] <GaryvdM> lau: bzr will allways tell you if there was a conflict, and it has put in thoes merge things.
[20:05] <GaryvdM> lau: Many bzr commands to merges to the working tree: pull, update, merge, switch
[20:22] <GaryvdM> jam: ping
[20:27] <GaryvdM> If I have a list of paths, is there a easy way to get the path of the lca using a python, or bzrlib api?
[20:28] <jam> hey GaryvdM
[20:28] <GaryvdM> Hi jam
[20:28] <GaryvdM> jam: I wanted to ask you the question above.
[20:29] <GaryvdM> if I have ["a/b/c", "a/b/d", "a/c"] I want to get "a"
[20:29] <jam> GaryvdM: lca? Do you mean the minimal paths to include everything you specified?
[20:29] <jam> osutils.get_minimum_path_selection() IIRC
[20:29] <GaryvdM> yes
[20:29] <GaryvdM> Ah -cool
[20:30] <jam> it is used along with 'is_inside_any'
[20:30] <jam> this is to avoid passing the entire tree in for 'first commit' ?
[20:30] <GaryvdM> Thanks alot.
[20:30] <GaryvdM> jam: No - it for qbrowse, drag and drop move
[20:31] <GaryvdM> I need to work out of a selection of paths is ok for a move
[20:34] <GaryvdM> jam: this is ok: http://imagebin.ca/img/UH2_flra.png
[20:34] <GaryvdM> This is not ok: http://imagebin.ca/img/Zynept0Z.png
[20:38] <jam> GaryvdM: perhaps, but I could see the latter being ok, just taking more work to figure out what exactly goes where...
[20:39] <GaryvdM> Jam: do you create a new "ui" dir, or dump it in the root of where it was moved to?
[20:40] <jam> GaryvdM: good question :)
[20:40] <jam> hence the "what goes where"
[20:40] <jam> *I* would say that if you select files, then they get dumped into the target dir
[20:41] <jam> w/o creating a new 'ui' dir
[20:42] <GaryvdM> jam:  I guess that would make sense for a selection like this: http://imagebin.ca/img/UZLOAps9.png
[20:43] <jam> GaryvdM: right
[20:43] <jam> though you could always "punt" and say that all files must be in the same dir, etc.
[20:43] <GaryvdM> jam: for now, I would prefer to just disable it. It needs to do what the user expects, and there will always be uncertainty here.
[20:45] <GaryvdM> So I want to check that if a path is  selected from a sub dir, then both the dir, and all of it children must be selected.
[21:02] <smartgpx_> nck smartgpx
[21:02] <smartgpx_> nick smartgpx
[21:02] <lifeless>  you want a / at the start of that
[21:04] <smartgpx> lifeless: thanks Robert
[21:09] <GaryvdM> jam: get_minimum_path_selection was not what I was looking for, but was what I needed :-)
[21:14] <jam> GaryvdM: I'm glad you got what you wanted
[21:16] <lifeless> jam: its saturday for me, but if you want to talk about the push regression I'm up for that
[21:17] <jam> lifeless: debugging further it seems to only occur if you have a remote bzrdir w/o a remote branch
[21:17] <jam> so it isn't quite as critical as I thought
[21:17] <jam> It then pushes the whole repo
[21:17] <jam> rather than just the ancestry
[21:17] <lifeless> so
[21:17] <lifeless> /.bzr/repository
[21:17] <lifeless> /foo/.bzr
[21:17] <lifeless> bzr push ../foo
[21:17] <lifeless> ?
[21:17] <jam> foo/.bzr/branch-format but no foo/.bzr/branch/
[21:18] <jam> lifeless: right, something like that
[21:18] <lifeless> so I've seen some odd stuff in that space recently too
[21:18] <jam> lifeless: the checkout stuff ?
[21:18] <lifeless> I filed a bug about branch references getting pushed
[21:18] <jam> yeah
[21:18] <jam> I've been trying to walk through the steps
[21:18] <jam> and we have some *horribly* indirections
[21:19] <jam> 'Branch.push()' calls into InterBranch.push which calls _basic_push which calls Branch.update_revisions which calls InterBranch.update_revisions which...
[21:19] <jam> lifeless: and I believe that is when you *do* have a target branch
[21:19] <jam> which I was trying to compare w/ when you *don't*
[21:20] <lifeless> yeah
[21:20] <jam> I need to just single-step through it and figure out what is going on
[21:20] <lifeless> I expressed concerns about IB but jelmer felt it was really needed
[21:20] <lifeless> It was already arcane deeper in anyhow
[21:20] <lifeless> but IB won't be related to the new branch case, I'm fairly sure
[21:21] <lifeless> thats all in .clone()
[22:48] <jamey_uk> I'm trying to pull a branch in and get this error: "bzr: ERROR: Invalid url supplied to transport: "invalid port number  in url: bzr+ssh://[my-url]"
[22:51] <jamey_uk> in my ~/.ssh/config file I have 'Host [ip-address] \n User [username] \n Port 1989 \n Hostname [my-domain.com]'
[22:51] <lifeless> bzr won't care about that
[22:51] <jamey_uk> Does anyone know why I get the error if I've set my custom port in ~/.ssh/config?
[22:51] <lifeless> what is the actual url you are using
[22:52] <lifeless> you can replace the host and path with arbitrary thgins
[22:52] <lifeless> but we need to see something that is equivalent to tell whats going on
[22:52] <jamey_uk> kind of following, one sec
[22:52] <jamey_uk> bzr pull bzr+ssh://dropoutuk@dropoutuk.com:/home/dropoutuk/www/
[22:53] <lifeless> get rid of the :
[22:53] <jamey_uk> at the beginning?
[22:53] <lifeless> no
[22:53] <lifeless> before /home
[22:53] <jamey_uk> oh
[22:56] <jamey_uk> great, what's an easy way to find out the bzr version installed? the server i'm pulling from is ubuntu 9.04 and this machine is ubuntu 9.10 - i'm getting "Bazaar repository format 2a (needs bzr 1.16 or later)"
[22:56] <jamey_uk> and just out of interest, I've used that syntax before for ssh:// paths, why the missing colon before the path? (or am I mistaken generally)
[23:04] <sven_oostenbrink> fullermd: bzr is FAST... in comparison with SVN / SVK anyway... I have a source code tree of 40.000+ files and its bzr add, boom, done... bzr commit... okay, takes a bit more, but still.. FAST! :)
[23:05] <jamey_uk> Can anyone help me with my bzr 1.16 or greater problem?
[23:09] <lfaraone> Have any speed benchmarks been done with the new branch format and git? http://bazaar-vcs.org/Benchmarks only seems to cover size.
[23:11] <jamey_uk> I've got a repo on my remote server and trying to pull locally into a freshly init'd repo but keep getting error "azaar repository format 2a (needs bzr 1.16 or later)". Any ideas?
[23:11] <vila> jamey_uk: 'bzr version' will tell you which version you're using
[23:12] <sven_oostenbrink> fullermd: I have a development group of 3 persons (myself included).. I want every developer to work on his own branch so that everybody is working seperately on their own laptops (so there will be 3 branches).. then I want the trunk to be on a central server.. we will all merge our changes to that place..
[23:13] <vila> jamey_uk: to upgrade to the latest stable version, see https://edge.launchpad.net/~bzr/+archive/ppa for instructions
[23:13] <jamey_uk> vila, thanks seems like Ubuntu 9.04 has 1.13.1 whilst 9.10 has 2.0.0. What's the safest way to upgrade to 2.x on the former?
[23:13] <sven_oostenbrink> fullermd: That sounds like a good idea? to do it like that? Then, I have the current tree over here on my laptop..  I bzr init, bzr add and bzr commit that tree.. How do I get it to be on that server? bzr push ssh+bzr://me@server ?
[23:13] <jamey_uk> vila, thanks you beat me to it :)
[23:14] <vila> jamey_uk: always happy to help (mt) :-D
[23:14] <vila> s/mt/tm/
[23:15] <jamey_uk> vila, how do I add the key for that source to my apt?
[23:16] <vila> jamey_uk: read that page, open the Technical details, click 'Read about installing'
[23:17] <vila> You'll get all the gory details with ready-to-copy commands
[23:17] <jamey_uk> that's exactly what I did but I has only bash at my disposal :)
[23:17] <jamey_uk> no X here my friend
[23:18] <vila> jamey_uk: ? 'ssh -Y' to the rescue ?
[23:18] <lifeless> jamey_uk: the : at the end leads into a port, bzr uses urls, not rsh paths
[23:19] <jamey_uk> haha no, no, I don't need no X11 thank you :)
[23:19] <jamey_uk> lifeless, ah yes of course thanks for explaining
[23:20] <jamey_uk> vila, being a total n00b sorry, I thought it was a two stage process - first to fetch a GPG key or something, then to use apt-key. all is swell
[23:21] <vila> jamey_uk: great, because I just realized I'm wat past bed time :-)
[23:21] <vila> g'night all !
[23:24] <jamey_uk> g'night, thanks for your help!