[00:05] <lifeless> cool
[00:10] <Peaker> is it possible that the repository recorded my g-w permission bit when I first created it, and now is using g-w on all mkdirs because of that?
[00:11] <fullermd> It doesn't record it, except in the perms of the dirs.
[00:11] <fullermd> If you chmod -R xyz .bzr/*, it'll use xyz.
[00:12] <Peaker> oh maybe its n04m's .bzr that has g-w bit...
[00:12] <Peaker> he is the one making dirs with g-w :)
[00:16] <fullermd> Well, obviously.  '04' doesn't include g+w   ;p
[00:17] <Peaker> ya I am not sure what the deal with the l33tsp34k is there :)
[00:19] <nekohayo> hi jelmer, I'm trying to fix some things up in olive, but it seems that any changes I make to /ui.py do nothing... any ideas?
[00:19] <lifeless> jelmer: bugmfiling time on the cli
[00:20] <jelmer> lifeless, which cli?
[00:20] <jelmer> nekohayo: hi jeff
[00:20] <nekohayo> I want to alleviate those jumping progressbars, but no changes are visible... even if I change the window title from "Progress" to "Monkey", it does not work
[00:20] <lifeless> branch registration
[00:24] <jelmer> nekohayo: maybe it's using the one installed on the system?
[00:25] <nekohayo> jelmer: that's strange, locate "ui.py" |grep bzr does not return an exact match
[00:26] <jelmer> nekohayo, not sure then what may be causing it
[00:27] <abentley> Peaker: Did you set the *remote* umask?
[00:28] <Peaker> abentley: Its fixed now, the problem was the commiter's .bzr directory, not mine
[00:28] <Peaker> abentley: when he created branches under my .bzr, permissions from his remote .bzr were used
[00:28] <abentley> That seems extremely unlikely.
[00:29] <Peaker> abentley: he used:  bzr get URL-TO-ME  URL2-TO-ME       and URL2-TO-ME inherited the .bzr permissions of hiw CWD, not of URL-TO-ME
[00:29] <abentley> When you use bzr+ssh, the permissions of the remote bzr are used, as if you were ssh-ing in, and creating the files by hand.
[00:30] <Peaker> abentley: Looked a bit at the bzr+ssh code, it has an mkdir method that takes a mode and which means its likely that his local machine is telling the bzr+ssh url handler to set the modes inherited from his local .bzr, which in fact happened (as he fixed his .bzr permissions, the url2 started being created with g+w)
[00:30] <abentley> Oh, you're not talking about creating files over bzr+ssh.
[00:30] <nekohayo> jelmer: hmm. Now that makes me wonder, what is ui.py for inside the bzr-gtk trunk?
[00:30] <nekohayo> if it doesn't use it
[00:30] <jelmer> nekohayo: it *should* use it
[00:30] <abentley> You're talking about retrieving data from bzr+ssh, and creating files locally.
[00:32] <nekohayo> jelmer: any way to *force* it to use it?
[00:32] <abentley> Owner and group can be inherited from CWD, but permissions cannot.
[00:32] <jelmer> nekohayo: It should be using it in all cases
[00:32] <nekohayo> then wtf o_o
[00:32] <Peaker> abentley: no, I am talking about creating a remote bzr+ssh branch of another bzr+ssh branch. For some reason it used his local unrelated CWD repository perms for that
[00:32] <abentley> Permissions, i.e. r/w/x, come only from the umask.
[00:32] <lifeless> nekohayo: do this; python -c 'import bzrlib.plugins.gtk; print bzrlib.plugins.gtk.__file__'
[00:33] <nekohayo> /home/jeff/.bazaar/plugins/gtk/__init__.pyc
[00:33] <nekohayo> ah ha! wtf² :) /me removes that dir
[00:34] <abentley> Well, I consider it extremely unlikely that his local CWD permissions have anything to do with it.
[00:34] <Peaker> abentley: Nope, the umask was and is 002.  He created branches and they had g-w until he changed his local CWD .bzr to be g+w and then the branches he created remotely in my machine started having g+W
[00:34] <Peaker> abentley: that's just what happened
[00:35] <abentley> Okay, if you say so.
[00:35] <nekohayo> yay, it works, thanks lifeless and jelmer... I can get back to trying to sanitize that progress dialog
[00:39] <nekohayo> holy cow
[00:39] <nekohayo> those progressbars are weird
[00:39] <nekohayo> they remove themselves dozens of times per second!
[00:40] <nekohayo> don't quite know what to do with that
[00:40] <fullermd> Tell 'em to quit taking so many breaks or you'll fire them?
[00:40] <nekohayo> I should
[00:40] <jelmer> nekohayo: I've been thinking about making it possible to set a "progress bar widget"
[00:41] <jelmer> so windows can tell the progress bar to appear in a specific place before they start doing something
[00:41] <nekohayo> jelmer: ?
[00:41] <jelmer> (like viz analysing history)
[00:41] <nekohayo> a big question I'd like to ask
[00:42] <nekohayo> wouldn't it be simpler to just have *one* master progressbar?
[00:42] <jelmer> nekohayo: There is a top-level progressbar
[00:42] <nekohayo> that doesn't jump around and hold-up grandma
[00:42] <jelmer> so you could choose to ignore all sub-progress bars
[00:42] <nekohayo> ignore?
[00:43] <jelmer> nekohayo, not display
[00:45] <Peaker> when I "bzr pull" into a bound checkout, does it pull into my working-dir/branch, or into the remote bound branch and syncs us both?
[00:46] <nekohayo> jelmer: hrmm. Do you have a branch of that or something?
[00:46] <fullermd> Peaker: The latter.
[00:46] <nekohayo> a bit beyond my skillset i think, but if you want a UI reviewer I'd be glad to comment, etc
[00:46] <Peaker> fullermd: cool, what I'd expect :)
[00:47] <nekohayo> [the coding being beyond my skillset :]
[00:47] <jelmer> nekohayo: No, not yet. The progress bars need a lot of work, not just the way they look but also the way they're handled inside of bzr-gtk/olive
[00:48] <jelmer> nekohayo: Comments the UI are more than welcome on the mailing list or the bug tracker
[00:48] <nekohayo> jelmer: do you have a bug/discussion thread about what you're planning to make them look like yet?
[00:49] <jelmer> nekohayo: Ideally, they'll be integrated in the various windows
[00:49] <jelmer> nekohayo: and no longer be standalone windows
[00:49] <jelmer> nekohayo: they really need a lot of refactoring first before we can look at the specific ui
[00:50] <fullermd> jelmer: Hm.  Is the weird clipboard interaction of the post-tab viz intentional?
[00:51] <jelmer> fullermd: clipboard interaction?
[00:51] <fullermd> I'll take that as a no, then?   ;)
[00:52] <nekohayo> jelmer: actually, I think the best way would be having an "info pane" like gedit's at the top below the toolbar
[00:52] <nekohayo> have you ever seen it?
[00:52] <jelmer> fullermd: yes :-)
[00:52] <fullermd> I pull up viz, flip over to the Relations tab.  When I flip back to General, it highlights the revid and sticks it in my clipboard.
[00:52] <fullermd> Odder still, when I flip back to Relations or exit viz, it restores the clipboard to what it was beforehand.
[00:52] <jelmer> nekohayo: bzr-gtk is not just olive, the various dialogs can appear without olive as well
[00:53] <nekohayo> jelmer: but then how would you integrate them into the various windows?
[00:53] <jelmer> fullermd: Ah, I see it now too
[00:54] <jelmer> nekohayo: integrate them into the various windows themselve rather than in some top-level window
[00:54] <jelmer> nekohayo: or did I misunderstand you earlier?
[00:55] <nekohayo> jelmer: well isn't olive just one top level window?
[00:55] <jelmer> nekohayo: some of the windows that can appear with olive as top level window can also appear standalone
[00:55] <nekohayo> jelmer: that's what I was thinking about, with one and only master progressbar http://blogs.gnome.org/lucasr/files/2007/02/eog-error.png
[00:57] <jelmer> nekohayo: the problem is, the master progress bar isn't always linear
[00:57] <lifeless> we can't do linear
[00:57] <nekohayo> let's have an infamous mac OS beach ball :)
[00:58] <lifeless> we can do linear so some parts of the operation
[00:58] <jelmer> nekohayo: so you may want to see the subprogressbar in some cases
[01:00] <jelmer> nekohayo: I think this would be an interesting thing to bring up on the list
[01:00] <jelmer> but I'm getting some sleep first, g'night!
[01:05] <nekohayo> jelmer: I'll copy-paste snippets of this chat onto https://bugs.launchpad.net/bzr-gtk/+bug/127734
[01:05] <ubotu> Launchpad bug 127734 in bzr-gtk "Progress bars as widgets" [Medium,Triaged]
[01:05] <nekohayo> (I'm really not comfortable with mailing lists)
[01:09] <Peaker> is it safe to delete ~/.bazaar/svn-cache/ ?  bzr-svn is giving me weird trouble
[01:12] <jelmer> nekohayo: sure, that'd be useful
[01:12] <jelmer> Peaker: yes, it'll just be a bit slower trying to regenerate that data next time you use it
[01:12] <jelmer> Peaker: how is it giving you trouble?
[01:13] <Peaker> jelmer: depends on which svn branch scheme i use and which URL, I either get "invalid revision id", or divergence errors, or bad scheme/svn url
[01:14] <Peaker> jelmer: at one point pull failed on the same URL but bind+updatee worked, but then commit failed claiming divergence
[01:15] <jelmer> Peaker: which version are you using?
[01:17] <Peaker> Bazaar (bzr) 0.90.0  - how do I get the bzr-svn version?
[01:17] <jelmer> "bzr plugins" should print it
[01:17] <Peaker> it just printed the directory. I got it from dpkg -l: ii  bzr-svn            0.4.1-1
[01:18] <Peaker> btw: now it seems completely stuck at pulling from the svn...
[01:18] <jelmer> Peaker: stuck how?
[01:18] <Peaker> maybe its downloading, I don't know
[01:18] <Peaker> I used "bzr pull https://eyal.lotem@enough.googlecode.com/svn"
[01:19] <Peaker> entered the password, and its working for a looong while
[01:19] <jelmer> 0.4.1 is quite old
[01:19] <jelmer> and it worked fine on that url before?
[01:20] <Peaker> Yeah, I think its decided to re-download the entire history, because my network is working
[01:21] <Peaker> which is weird because I am pulling into a branch inside a repository that already has the entire history
[01:21] <Peaker> I hope it wont do damage to my repo :P
[01:22] <jelmer> whether it pulls doesn't depend on whether your network is up
[01:22] <jelmer> Peaker: it says "fetching revision info" ? or "copying revision" ?
[01:23] <Peaker> jelmer: my network is "working", as in something's downloading. I dont have progress report, so its my only way of knowing
[01:23] <Peaker> it doesn't say anything beyond "https://enough.googlecode.com/svn is permanently redirected to http://enough.googlecode.com/svn/" after the password prompt
[01:23] <Peaker> its just waiting
[01:25] <jelmer> Peaker: are you sure it worked earlier? because I wouldn't know what could be asking for a password...
[01:26] <Peaker> jelmer: it worked days ago, since then I pulled/pushed and did lots of things to that branch
[01:26] <Peaker> nm, its not that important I gave up on pushing back to svn
[01:26] <Peaker> how do I get a diff out of a "bzr missing"?
[01:27] <jelmer> Peaker: I'm very curious why it broke, because it really shouldn't
[01:28] <Peaker> jelmer: Well, I used trial&error and messed around with it a lot, so it will be hard to separate the variables here
[01:28] <Peaker> jelmer: maybe I did something wrong..
[01:28] <jelmer> Peaker: bzr diff prints diffs, missing can't
[01:29] <jelmer> Peaker: if you've only used the bzr command-line, it shouldn't break
[01:29] <jelmer> 0.4.1 is quite old though.. :-/
[01:29] <Peaker> jelmer: I edited and then deleted ~/.bazaar/subversion.conf too
[01:30] <Peaker> it had "trunk0" I tried changing to "trunk" to "none" and then to delete it
[01:30] <Peaker> (in branching-scheme)
[01:31] <jelmer> that shouldn't be a problem
[01:32] <Peaker> well, I think debugging a non-important problem on a non-recent version of a plugin in a not-documented state of branches is probably not a priority :)
[01:32] <Peaker> If I want to review the work done on a branch, relatively to its base branch, do I have to merge back, look at the diff, and then revert?
[01:33] <Peaker> wow I'm getting 4KB/sec of ARP/DHCP background broadcast noise from my ISP :)
[01:34] <Peaker> was wondering where that is coming from
[01:34] <lifeless> Peaker: diff -r ancestor:../base
[01:35] <Peaker> ancestor is a special rev token?
[01:37] <fullermd>  -> help revisionspec
[01:37] <Peaker> ah thanks. "bzr vis" seems like a nice way of reviewing branches too
[01:37] <Peaker> I wish it showed the whole file in meld/kompare tho
[01:42] <Peaker> a diff is not showing me enough context. meld doesn't seem to take input from stdin, and kompare hangs :( How do you view/review your diffs?
[01:44] <Verterok> moin
[01:45] <Peaker> moin?
[01:46] <fullermd> Yeah, niom spelt backward.
[01:47] <Peaker> is that a way to view diffs? :)
[01:52] <Verterok> ups, I just was saying Hi!
[01:53] <Verterok> Peaker: try with, bzr cat -r revno file_name > file_name_revno, and then use kompare/vimdiff/kdiff3
[01:54] <Peaker> Verterok: I want the diff of a branch, not a specific file
[01:55] <Verterok> ok
[01:57] <Peaker> I guess I can just do the merge, and then use emacs's dvc
[01:59] <Verterok> Peaker: I just executed, bzr diff -r branch:../trunk | kompare -
[01:59] <Verterok> and (for me) worked just fine
[02:00] <lifeless> Peaker: bzr difftools can run meld for you IIRC
[02:00] <Peaker> Verterok: it should, it just hangs here :-(
[02:00] <lifeless> night all
[02:01] <Peaker> lifeless: what command would that be?
[02:03] <Verterok> maybe this http://bazaar.launchpad.net/~sward-dev/bzr-difftools/trunk or http://mysite.verizon.net/sward.dev/projects/bzr_difftools.tar.gz ?
[02:07] <Peaker> lifeless: thanks, night
[02:11] <Peaker> difftools is giving me a diff on the .bzr dir itself :P
[02:22] <Peaker> ok, kompare eats a -p1 diff just fine! whew
[02:22] <Peaker> it probably doesn't like that the src/dest are identical in the default diff
[02:24] <Peaker> or kompare doesn't like actually finding the involved files
[02:25] <Verterok> Peaker: try passing -n switch to kompare
[02:26] <Verterok> to avoid search for the files
[02:27] <Peaker> nope it hangs anyway
[02:27] <Peaker> If I use -p1 and replace old/ and new/ with parent-branch/ and this-branch/ it works tho
[02:27] <mc__> i  killed bzr while commiting,now i cant comit cause there still is the lock.what shall i do?
[02:28] <Verterok> I'm using kompare 3.5.8, maybe it's fixed in this version
[02:28] <Verterok> mc__: try with 'bzr break-lock'
[02:29] <mc__> Verterok: you saved my day!
[02:30] <Peaker> Verterok: 3.5.8 here too
[02:30] <Peaker> Verterok: you can bzr diff | kompare -o - ?
[02:31] <Verterok> yes, it's work fine here, my branches are small ~50 revisions
[02:32] <Verterok> and I'm making a diff of 16 revisions
[02:33] <Peng> Wow. 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.8.2.9.1.9.1.1 is an AWESOME revno.
[02:34] <Peaker> hehehe
[02:34] <mc__> Verterok: well i did  bzr break-lock,and it worked great. but now it hangs while commiting first it goes super fast but then it hangs with "[[02:35] <mc__> the command i use is "bzr ci -m "now we've got working scaffolds(really)""
[02:36] <Peaker> why does difftools show the .bzr in the diff?
[02:36] <mc__>  
[02:36] <mc__> bzr(python) uses 0% cpu
[02:36] <fullermd> Sure, but what's it using on the network?
[02:36] <fullermd> Uploading data doesn't take much suds.
[02:37] <mc__> i dont how i can find out its bandwith usage
[02:37] <Peaker> I guess I can use difftools and ignore the .bzr dir
[02:37] <mc__> but it shouldnt take that long,the files are only several kb
[02:40] <Peaker> trying to write a plugin to create a command that combines two commands. How do you invoke a clean-tree --missing via bzrlib? and other commands?
[02:41] <fullermd> Isn't clean-tree bzrtools, not bzrlib?
[02:41] <Peaker> oops it is yeah
[02:41] <Peng> Yes it is.
[02:42] <Peaker> ok but to run remove_tree does it make sense to instantiate its cmd_remove_tree and run that?
[02:42] <mc__> hmpf,now i got "Read from remote host austriangeekforce.net: Operation timed out
[02:42] <mc__> " today is not my luckiest day
[02:42] <Peaker> or use bzrdir.BzrDir.open(location) that's behind the cmd_remove_tree?
[02:43] <fullermd> That, I have no idea.  I suspect reimplementing the command isn't the best course, though.
[02:45] <Peaker> I am not sure how to instantiate a cmd_* object
[02:52] <Peaker> ok cool I have a new remove-full-tree that kills ignored files and then runs remove-tree :)
[02:53] <Peng> "find . -exec 'rm -rf {}' ';'"?
[02:53] <Peng> Well, excluding .bzr. :P
[02:54] <fullermd> Yeah, that sure would save some space...
[02:54] <fullermd> As a bonus, it not only cleans the tree, but removes unreferenced revisions from the repository   :p
[02:54] <Peaker> fullermd: heh its also to avoid a mess where by my emacs is editing files from multiple branches
[02:54] <Peaker> I prefer to have only the active branch's files in place
[02:55] <Peaker> I think ignored files should be considered disposable, and thus remove-tree should remove them... since it doesn't I made this plugin
[03:08] <mc__> now this looks like a bug,commiting small changes work,but if there are several files added bzr hangs for several minutes and then aborts
[03:09] <Peaker> where can I publish a branch of the plugin I made?
[03:09] <mc__> Peaker: launchpad.net ?
[03:10] <Peaker> open a whole project for it? overkill, its 10 lines of python
[03:10] <Peaker> is there some wiki somewhere where I can paste a branch address?
[03:10] <mc__> if the project is on launchpad you can list your branch there i think
[03:11] <Peaker> yeah I don't want to open a whole project for it
[03:12] <mc__> contact the original author,maybe he will adopt your changes
[03:14] <Peaker> editing the site wiki table is insane
[03:27] <jdub> jelmer: about?
[04:09] <Odd_Bloke> Peaker: You can push a branch to your own personal space without creating a project.
[08:19] <Peaker> bzr currently 'crashes' when it tries to make a symlink on Windows, instead of just printing a warning and doing nothing or making a text file like in svn
[08:23] <Peaker> s/currently/Bazaar (bzr) 0.90.0
[08:25] <Peaker> when making a light weight checkout, does the download not include the history either?
[08:27] <Peaker> cause a friend is making a light weight checkout from my machine and its taking ages, as if its downloading the entire history
[08:29] <Peaker> or can that happen because I'm using a dumb server here?
[08:35] <Peng> Peaker: Lightweight checkouts don't save any of the history, but if it's a dumb server, it probably needs to download quite a lot to get the latest version of all files.
[08:35] <Peaker> Peng: Yeah that's what must have happened
[08:35] <Peaker> Peng: I was wondering if there's a silly download-history-to-discard-it thing
[08:35] <Peaker> but I guess that's only because of the dumb server
[08:35] <Peaker> anyhow, thanks, gotta go
[09:05] <Bloged> Good day everybody
[09:05] <Bloged> I've got a, probably easy, question
[09:07] <Bloged> I have a file that contains (default) configuration options. Users edit this file with for example their username.
[09:07] <Bloged> I've want to keep track of the default. But want to ignore the edits made by users.
[09:07] <Bloged> Is there a way to ignore edits to this file. Except when explicit commited?
[09:10] <luks> I usually version myconfig.conf.default, which everybody has to copy to myconfig.conf
[09:11] <Bloged> Ok... that's a solution
[09:14] <Bloged> Thanks until a better solution is found this one will do
[09:14] <luks> I haven't found anything better yet :/
[09:15] <Bloged> Ok... to bad .bzrignore ignores only those file not yet in the repository
[09:30] <Peng> Someone else asked for that feature a couple months ago. It would be pretty useful.
[09:36] <Bloged> Yes it would be very useful was there a feature request or something created?
[09:36] <Peng> Yeah, I think so.
[09:36] <Peng> A spec.
[09:36] <Bloged> Any idea where I can find that one?
[09:37] <Peng> Honestly, I didn't like it much. It was kind of complex.
[09:37] <Peng> Bloged: Somewhere on http://bazaar-vcs.org/ :P
[09:38] <Bloged> Yep that is something I thought so... but I've searched for this feature and couldn't find anything remotely like it... Feature/Specification or already implemented :|
[09:38] <Peng> Maybe it was deleted.
[09:42] <Bloged> Shouldn't it be on launchpad?
[10:40] <fluidics_ss2> i'm trying bzr for the first time. i want to push something using bzr+ssh but i run ssh on a different port. is it still possible?
[10:40] <Bloged> I've never tried it but: <ip>:<port> isn't working?
[10:41] <fluidics_ss2> doesn't seem to be
[10:41] <fluidics_ss2> ahh no
[10:41] <fluidics_ss2> i'm lieing it does work!
[10:41] <fluidics_ss2> i was putting a slash in the wrong place
[10:45] <fluidics_ss2> ok i'm getting somewhere, it's saying something about the langauge is incorrect
[10:46] <fluidics_ss2> i have to set $LANG somewhere for the python interpretter
[10:46] <fluidics_ss2> how do i do that?
[10:46] <ubotu> New bug: #158972 in bzr "http server use both settimeout and makefile" [Undecided,New] https://launchpad.net/bugs/158972
[10:52] <fluidics_ss2> bzr: warning: unsupported locale setting
[10:52] <fluidics_ss2>   Could not determine what text encoding to use.
[10:52] <fluidics_ss2>   This error usually means your Python interpreter
[10:52] <fluidics_ss2>   doesn't support the locale set by $LANG (en_GB.UTF-8)
[10:52] <fluidics_ss2>   Continuing with ascii encoding.
[10:52] <fluidics_ss2> bzr: ERROR: exceptions.AssertionError: end of file reading from server.
[10:52] <fluidics_ss2> ^^^ that's what i'm getting
[10:53] <luks> fluidics_ss2, the remote server is probably missing the en_GB.UTF-8 locale
[10:53] <fluidics_ss2> is that in python?
[10:54]  * fluidics_ss2 knows very little about python
[10:54] <luks> bzr+ssh just calls bzr on the server
[10:54] <fluidics_ss2> oh ok
[10:54] <luks> you just need to install the locale
[10:54] <luks> nothing python related
[10:56] <fluidics_ss2> what's a locale?
[10:57] <fluidics_ss2> i mean, what sort of package name am i looking for to install it?
[10:57] <Bloged> locale stands for Language Collection
[10:57] <Bloged> What kind of server?
[10:57] <fluidics_ss2> ubuntu
[10:57] <Bloged> sudo apt-get install language-support-en
[10:58] <fluidics_ss2> cool
[10:58] <fluidics_ss2> thanks
[10:58] <Bloged> to search for packages via command line use "apt-cache search <search_string>
[10:59] <Bloged> Minus the "
[10:59] <Bloged> apt-cache search <search_string>
[10:59] <fluidics_ss2> yeah, i trying that
[10:59] <fluidics_ss2> well that just installed a lot of stuff
[11:00] <fluidics_ss2> stuff to do with fonts and open-office
[11:00] <fluidics_ss2> i'm not sure that was particularly good
[11:00] <Bloged> If it works now you could always autoremove this metapackage
[11:02] <fluidics_ss2> well i'm still getting the same error about locale but i don't think that's the real issue
[11:02] <luks> sudo locale-gen en_GB.UTF-8
[11:02] <Bloged> sudo apt-get autoremove language-support-en
[11:03] <Bloged> That will undo your install of the metapackage and dependencies if you want
[11:03] <fluidics_ss2> do you mean autoclean?
[11:03] <fluidics_ss2> yeah that didn't do anything
[11:03] <fluidics_ss2> nevermind
[11:03] <Bloged> No autoremove is remove and autoremove dependencies
[11:05] <fluidics_ss2> ok
[11:05] <fluidics_ss2> autoremove only works on edgy and newer it would seem
[11:05] <fluidics_ss2> don't worry
[11:05] <Bloged> Ok...
[11:05] <fluidics_ss2> i think the bzr push is completing
[11:05] <fluidics_ss2> i'm trying to push a branch like this bzr push bzr+ssh://ip:port/test
[11:06] <fluidics_ss2> and it's creating the test dir on the remote machine
[11:06] <fluidics_ss2> but it's empty
[11:06] <fullermd> No it's not, it's got .bzr/ in it
[11:06] <fluidics_ss2> ls -a reveals: .  ..  .bzr
[11:06] <fluidics_ss2> where's my stuff then? :P
[11:07] <Bloged> I'm still very new to Bazaar to... but that seems to be correct
[11:07] <fullermd> In .bzr   :)
[11:07] <fluidics_ss2> .bzr really is empty
[11:08] <fluidics_ss2> ls -Ra /test
[11:08] <fluidics_ss2> .  ..  .bzr
[11:08] <fluidics_ss2> .  ..
[11:08] <fullermd> Well, then push didn't complete.
[11:08] <Bloged> ls
[11:08] <Bloged> branch  branch-format  branch-lock  checkout  README  repository
[11:09] <fluidics_ss2> yeah, i think this error "bzr: ERROR: exceptions.AssertionError: end of file reading from server." might have something to do with it
[11:09] <fluidics_ss2> btw thanks for all the help so far guys
[11:09] <fullermd> If you're getting that locale error, then yeah, that would probably be stopping it at that point.
[11:10] <fluidics_ss2> hmm ok
[11:10] <fluidics_ss2> well the apt-get install lang.... stuff didn't seem to fix that
[11:10] <fluidics_ss2> i ran it on both servers
[11:10] <fullermd> The problem there is likely to be not a lack of a package on the server side, but that your LANG is set wrong.
[11:10] <fluidics_ss2> set | grep LANG outputs nothing
[11:11] <fullermd> Try 'locale'
[11:11] <fluidics_ss2> ooooo
[11:12] <fluidics_ss2> well yes, now we have identified a discrepency :)
[11:12] <fullermd> Maybe it's set via LC_ALL or something.  I'm not entirely clear on the intentional difference between the ways of setting it.
[11:14] <fullermd> Anyway, the problem is likely to be that you've set your locale to ".UTF-8" and your system-defined locales are ".utf8" or something like that.
[11:14] <fluidics_ss2> on one of the servers the locale is blank
[11:15] <fluidics_ss2> which can't be right :)
[11:15] <fullermd> Blank would mean C, which should be fine (may be _incorrect_, but it's not broken)
[11:16] <fluidics_ss2> ok, i've run export LANG="en_GB.UTF-8"
[11:16] <fluidics_ss2> and now locale output is the same on both servers, yay!
[11:17] <fluidics_ss2> ok lets give this push thing another go
[11:17] <fullermd> Shouldn't matter if they're different, as long as both are valid.
[11:18] <fluidics_ss2> made no difference
[11:18] <fluidics_ss2> i think it's python saying "i don't support en/gb utf-8"
[11:19] <fullermd> Well, yeah.  That's my point   :p
[11:19] <fullermd> Look at what locale tells you it's set to, and look at what locale -a says are valid choices.  You'll probably find a discrepancy.
[11:19] <fluidics_ss2> ok
[11:20] <fullermd> And it's probably a .UTF-8 vs .utf8 thing (at least, that's the most common one I've seen)
[11:20] <fluidics_ss2> one server says:
[11:20] <fluidics_ss2> C
[11:20] <fluidics_ss2> en_GB.utf8
[11:20] <fluidics_ss2> en_US.utf8
[11:20] <fluidics_ss2> POSIX
[11:20] <fluidics_ss2> and the other says:
[11:20] <fluidics_ss2> locale: Cannot set LC_CTYPE to default locale: No such file or directory
[11:20] <fluidics_ss2> locale: Cannot set LC_MESSAGES to default locale: No such file or directory
[11:20] <fluidics_ss2> locale: Cannot set LC_COLLATE to default locale: No such file or directory
[11:20] <fluidics_ss2> C
[11:20] <fluidics_ss2> POSIX
[11:21] <fluidics_ss2> so i guess the remote server is missing some files
[11:21] <fullermd> The second, I presume is the one that was C (or blank), and you set to en_GB[...]
[11:21] <fluidics_ss2> yeah
[11:22] <fullermd> And the first...  well, there it is.
[11:23] <fluidics_ss2> yep i pasted both in up there
[11:24] <fluidics_ss2> i have no idea how to fix this
[11:24] <fullermd> Eh?  Set the locale to the valid choice.
[11:25] <fullermd> Find where you're getting en_GB.UTF-8 set, and change it to en_GB.utf8.  Computer don't guess words that 'look close' when you tell 'em something  :p
[11:26] <fullermd> In your shell rc file, most likely.
[11:26] <fluidics_ss2> ah
[11:26] <fluidics_ss2> ok
[11:28] <fluidics_ss2> ~/.bashrc mentions nothing about locales
[11:28] <fullermd> Mmm.  I'm not sure what sequence of files bash reads.  I think there's a .profile or .bash_profile somewhere in the lineup too.
[11:28] <fullermd> It may be set in the system-wide ones in /etc.
[11:29] <fluidics_ss2> yeah ok i'll have a bit of a dig around
[11:35] <fluidics_ss2> i can't find anything
[11:35] <fluidics_ss2> i've grepped * on /etc and ~ for en, gb and utf8 and the only mentions seem to be irrelevent
[11:39] <fluidics_ss2> what's the difference between declare and export?
[12:06]  * fullermd mutters.
[12:07] <fullermd> Yeah, so who needs power anyway?
[12:08] <fluidics_ss2> this locale thing is a nightmare
[12:08] <fluidics_ss2> i give up (for now)
[12:08] <fullermd> How's that?
[12:09] <fluidics_ss2> i think i need to do something with localedef
[12:09]  * fullermd blinks.
[12:09] <fullermd> Huh?
[12:09] <fullermd> Does just overriding the env not do the job?
[12:09] <fluidics_ss2> nope
[12:09] <fluidics_ss2> i get errors in locale -a if i do that
[12:09] <fluidics_ss2> locale: Cannot set LC_CTYPE to default locale: No such file or directory
[12:09] <fluidics_ss2> locale: Cannot set LC_MESSAGES to default locale: No such file or directory
[12:09] <fluidics_ss2> locale: Cannot set LC_COLLATE to default locale: No such file or directory
[12:09] <fluidics_ss2> C
[12:09] <fluidics_ss2> POSIX
[12:10] <fullermd> Well, that's the server that did have it all unset, right?
[12:10] <fluidics_ss2> yeah
[12:10] <fullermd> It should be left unset, since it doesn't have any other locales anyway.  Your problem was on the other one.
[12:11] <fluidics_ss2> but seeing as i'm in the UK shouldn't it be set as so
[12:11] <fluidics_ss2> having it blank doesn't seem right to me
[12:11] <fullermd> C is a perfectly valid locale.
[12:11] <fluidics_ss2> what does the locale affect anyway?
[12:12] <fullermd> It may not give you everything you want, but that's not relevant to your _problem_.  Your problem is on the other server, where you have it set to an invalid value.
[12:12] <fullermd> A number of things, but the most important in this connection is character set.
[12:13] <fluidics_ss2> basically the crux of the problem is i didn't have breakfast this morning
[12:14] <fluidics_ss2> and so i'm not functioning
[12:14] <fluidics_ss2> after lunch this will probably all be easy
[12:14] <fullermd> Urg.  Yeah, that sounds like the root issue to me.
[12:14] <fullermd> At least you had coffee, right?
[12:14] <fluidics_ss2> nope, i don't think that would help really
[12:15] <fluidics_ss2> coffee makes me nervous
[12:15] <fullermd> ...   and you're still alive??
[12:15] <fluidics_ss2> yep :)
[12:15] <fluidics_ss2> i like the taste of coffee very much but i generally avoid it
[12:15] <fullermd> Man.  The world _is_ full of weird people   :p
[12:15] <fluidics_ss2> :)
[12:15] <fluidics_ss2> yep
[12:16] <fluidics_ss2> are you a bazaar developer?
[12:17] <fullermd> Oh, no.  My role in life is mostly to sit around trolling unwary bzr developers.
[12:18] <fluidics_ss2> trolling?
[12:19] <fluidics_ss2> google says "deliberately provoking arguments on newsgroups or bulletin boards, with no other intent than to gain attention for the sake of attention"
[12:20] <fluidics_ss2> well that sounds very rewarding
[12:20] <fullermd> Well, everybody needs a hobby.  It keeps me off the street   :)
[12:22] <fluidics_ss2> i think i'm going to have chicken and chips
[12:22] <fluidics_ss2> with tomato sauce
[12:25] <jelmer> jdub: hi
[12:26] <fluidics_ss2> hey
[13:33] <lifeless> morning sabdfl
[14:13] <lifeless> debs of 0.92~rc1 up
[14:27] <jelmer> yay
[14:59] <lifeless> jam-laptop: check your mail :)
[15:01] <Lo-lan-do> Hello
[15:01] <Lo-lan-do> Is there a way to replay more than one revision at once?
[15:01] <james_w> Lo-lan-do: you mean with rebase?
[15:02] <Lo-lan-do> I'm thinking of the rebase plugin
[15:02] <james_w> It will do as many as it can in sequence.
[15:02] <Lo-lan-do> Basically, I'd like a merge where individual commits aren't collapsed.
[15:03] <james_w> Ah, I haven't rebased a merge, so I'm not sure what happens.
[15:03] <Lo-lan-do> But in the other direction as compared with rebase: I'd like to graft the remote revisions on top of the local ones, instead of the other way round.
[15:04] <fullermd> Tricky.  You'd need a full DAG rebase.
[15:04] <Lo-lan-do> I'm not trying to rebase a merge, that was just a functional description of what I'm trying to achieve :-)
[15:04] <james_w> I think you would need to have a local branch of the remote one, reabse in that, and then pull across.
[15:04] <Lo-lan-do> Hmm.  Makes sense.
[15:06]  * Lo-lan-do gets paper+pen and starts drawing graphs
[15:06] <jelmer> Lo-lan-do: "bzr replay" can accept ranges of revisions these days
[15:06] <LeoNerd> Ooh.. is that like "tla replay" ..?
[15:06] <Lo-lan-do> jelmer: Oh, yay :-)
[15:07] <jelmer> it's not the exact reverse of rebase though, doesn't skip already completed merges by default for example
[15:08] <Lo-lan-do> Any chance it could take the whole range of missing revs when no range is specified?
[15:08] <Lo-lan-do> Yeah, I see.  Also, it won't change history.
[15:10] <jelmer> Lo-lan-do, replay is basically an automated diff+patch+commit that keeps revision metadata
[15:11] <Lo-lan-do> Hm.  Right.
[15:12] <jelmer> if you want a reverse for rebase, I think that should be a different command (or perhaps an option for rebase)
[15:13] <Lo-lan-do> I think what I'm looking for is something that would do one merge+commit for each remote rev I don't have locally.
[15:13] <Lo-lan-do> Does that make sense?
[15:13]  * fullermd blinks.
[15:13] <fullermd> You mean use this instead of merge?  Why?
[15:14] <jelmer> to have all remote revisions in the lhs history
[15:15] <fullermd> Urgle.
[15:16] <jelmer> Lo-lan-do: is this so all revisions show up in svn when you push into svn?
[15:16] <Lo-lan-do> Exactly.  And so that I don't have to re-type messages.
[15:17] <jelmer> so you're really trying to work around bug 158883
[15:17] <ubotu> Launchpad bug 158883 in bzr-svn "ability to push non-lhs revisions" [Undecided,New] https://launchpad.net/bugs/158883
[15:17] <Lo-lan-do> I guess that can be scripted rather easily, though.  If there's no interest for that kind of workflow.
[15:18] <jam-laptop> lifeless: I still can't get to the other machines
[15:21] <ubotu> New bug: #159021 in bzr "Unkown branch format after copy from Linux and Win32" [Undecided,New] https://launchpad.net/bugs/159021
[15:23] <dato> siretart: I saw your commit in pkg-bazaar, but no upload?
[15:25] <siretart> dato: yes, for two reasons: I'm on very limited bandwith right now, and I wanted to wait for the bzrtools release
[15:25] <siretart> dato: if you think it is a good idea to upload right now, go ahead!
[15:25] <dato> ah, I had forgotten about the latter.
[15:25] <dato> siretart: nope, I wanted to wait myself, but forgot about it :)
[15:26] <siretart> :)
[15:27] <gotgenes> Hey, you updated the debs! Thanks, guys!
[16:12] <poolie> hello
[16:20] <n04m> hi, my bzr failed in the middle of a commit (on bound branch) with the following:
[16:20] <n04m> TooManyConcurrentRequests: The medium '<bzrlib.smart.medium.SmartSSHClientMedium object at 0x85ebf6c>' has reached its concurrent request limit. Be sure to finish_writing and finish_reading on the currently open request.
[16:21] <n04m> and since that faillure,  a lock as been leaked and I cannot work anymore because it keeps waiting for the lock to be released
[16:21] <lifeless> bzr break-lock
[16:22] <n04m> thanks! but why did it happen in the first place?
[16:23] <n04m> also: after bzr break-lock I just ran commit again and it failed again.
[16:23] <n04m> with the TooManyConcurrentRequests error
[16:24] <n04m> raceback (most recent call last):
[16:24] <n04m>   File "/usr/bin/bzr", line 116, in <module>
[16:24] <n04m>     sys.stdout.flush()
[16:24] <n04m> ValueError: I/O operation on closed file
[16:24] <n04m> bzr: ERROR: bzrlib.errors.TooManyConcurrentRequests: Th...........
[16:30] <jam-laptop> n04m: normally you get that error when the ssh connection closes on you
[16:30] <jam-laptop> bug #82634
[16:30] <n04m> how can i find why does it closes?
[16:31] <jam-laptop> n04m: are you sure the other machine is up and running?
[16:31] <jam-laptop> (ssh host)
[16:31] <n04m> yes
[16:31] <n04m> i can ssh to it, and bzr update also works
[16:31] <jam-laptop> Is it a large commit?
[16:31] <jam-laptop> I don't know any specific reason it would close
[16:31] <n04m> no
[16:31] <jam-laptop> you could try switching from bzr+ssh:// to  sftp://
[16:31] <n04m> i don't know if he set up sftp
[16:31] <jam-laptop> but it would be the 'ssh' program that is closing its connection
[16:31] <jam-laptop> most people with ssh have sftp access
[16:32] <jam-laptop> you could at least try it
[16:32] <n04m> ok, one sec
[16:36] <n04m> seems to work except for this error:
[16:36] <n04m> modified gui/CompletionWidget.py
[16:36] <n04m> modified test/test_completions.py
[16:36] <n04m> bzr: ERROR: Permission denied: 'f0/test_completions.py-20071031004151-wqg45t4c1dj6gdnf-5.knit': [Errno 13] Permission denied
[16:37] <n04m> maybe that's what causes the ssh to close ?
[16:39] <lifeless> yes, there is a bug open on this
[16:39] <lifeless> its largely fixed in 0.93 - current bzr.dev - IIRC
[16:39] <n04m> ok. but what's this permission error?
[16:40] <lifeless> probably file system permissions on that file; does it have g+w ?
[16:40] <n04m> locally yes
[16:40] <lifeless> jam-laptop: whats the flag in the branch branch to set permissions manaagement on ?
[16:41] <lifeless> n04m: remotely
[16:41] <n04m> i was about to say: also remotely
[16:41] <n04m> but i'm not sure i'm looking in the correct place
[16:42] <n04m> my friend set up a bzr repository, and put it where i can access with sftp/ssh
[16:42] <n04m> but he also has his own repo on that same machine - i'm not sure it matters
[16:42] <n04m> (his own repo with branches bound to the same repo/branch i am working with)
[16:44] <n04m> how can i know in which directory bzr was trying to access this file 'f0/test_completions.py-20071031.......'
[16:45] <Peng> n04m: .bzr/repository/knits/
[16:47] <n04m> weird...there are several files in that directory, some of which are owned by peaker:group (ok) and some by peaker:peaker
[16:47] <n04m> i guess that's the problem
[16:47] <n04m> i'm not sure why that happens - but thanks!
[16:55] <lifeless> jelmer: the inspect button of bzr-gtj commit-notify seems bust
[16:57] <jam-laptop> lifeless: you mean the rwx bits? (those are always on, afaik)
[16:58] <jam-laptop> It is the old "sftp strips permissions" issue I'm guessing
[16:58] <jam-laptop> or if he is using bzr+ssh
[16:58] <jam-laptop> then he needs to be setting the umask to 0002
[16:58] <jam-laptop> and then chmod g+s
[16:58] <jam-laptop> (the directories
[16:59] <n04m> umask is already 0002
[16:59] <n04m> i don't know about g+s
[16:59] <n04m> i guess we'll have to wait until he get's up.... :)
[16:59] <jam-laptop> find . -type f -print0 | xargs -0 chmod 2770
[17:00] <jam-laptop> n04m: ^^
[17:00] <jam-laptop> you may not have the permissions
[17:00] <jam-laptop> ooops
[17:00] <jam-laptop> find . -type d -print0 | xargs -0 chmod 2770
[17:00] <jam-laptop> find . -type f -print0 | xargs -0 chmod 660
[17:00] <jam-laptop> and then
[17:00] <ubotu> New bug: #159046 in bzr "bzr check uses too much memory for large trees" [Medium,New] https://launchpad.net/bugs/159046
[17:00] <jam-laptop> chown -R :group .
[17:01] <n04m> ok, doing
[17:01] <n04m> no permissions to do that...we'll have to wait for him
[17:26] <dato> jelmer: oh, you fixed #140001. I don't have to do it! thanks a lot. :)
[18:06] <dato> jelmer: I poked it a bit, and I have some comments: (1) typo in FAQ, and svn timestamps should be UTC -> patch: http://dpaste.com/23821/; (2) pushing my name to svn:author raises a TypeError exception (http://dpaste.com/23823/); independently of that, in my opinion svn:author should be set to eg. the user part of the email address, to follow standard svn practice; but that's just my opinion :) and, uhm, I think not everybody who wants svn:date ...
[18:06] <dato> ... set will want svn:author as well, not sure about that.
[18:12] <dato> jelmer: (3) how about not making it fatal when setting svn:foo fails? so that eg. override-svn-revprops can be globally set to True? (4) not related to this particular feature, I'm encountering a "Invalid diff stream: insn 0 cannot be decoded'" error when pushing a certain repo; if you need a test-case: http://dpaste.com/23825/; (5) thanks!
[18:16] <lifeless> jam-laptop: ping
[18:19] <jam-laptop> lifeless: ??
[18:19] <lifeless> let me run an idea past you
[18:19] <lifeless> native pack reconcile.
[18:19] <lifeless> I'm thinking the best thing to do is:
[18:19] <lifeless>  - start a new pack
[18:19] <lifeless>  - clone data to it, correcting as we go
[18:20] <lifeless>  - if nothing was wrong, abort the write group
[18:20] <jam-laptop> so a repack + a reconcile in one step?
[18:20] <jam-laptop> pushing everything into a single pack file?
[18:20] <jam-laptop> which would be deleted if we find nothing wrong
[18:20] <lifeless> the alternative is to wait until we detect that something is wrong before we start cloning
[18:20] <lifeless> yes
[18:20] <jam-laptop> it seems okay, but it sure would be nice to know without having to write out all the data
[18:21] <fullermd> The question comes to mind "should manual repacks check/reconcile too as long as they're touching all this data"
[18:21] <lifeless> another alternative is to only copy the contents of packs that we think are corrupt; but index shadowing may lead to two reconciles in a row both having to move data
[18:22] <lifeless> fullermd: no; because packing does not process all the same data to the same degree.
[18:22] <lifeless> fullermd: but it's a good question.
[18:22] <fullermd> Well, not now.  But the eventual manual repack will re-preen through all of it to re-cross-delta stuff and all, right?
[18:23] <fullermd> (leaving auto-repack out of the picture, natch; 'fast' is the key there)
[18:23] <lifeless> fullermd: that doesn't require e.g. parsing the revision xml's and generating testaments to check signed revisions
[18:25] <fullermd> Hm.  I guess.
[18:25] <fullermd> It would be nice to have the option to do 'em all in one shot, though.  "Pack down my repo to all small and optimized, check everything, and fix any inconsistencies you can.  I'm gonna go grab coffee."
[18:26] <jam-laptop> well, you could have a "bzr pack --check" sort of flag
[18:26] <fullermd> That may just be an extension of my desire for check --fix as well, though.
[18:27] <jam-laptop> I know I'm not convinced that 1 giant pack is going to be optimal
[18:27] <jam-laptop> I think having 1 pack for ancestry
[18:27] <jam-laptop> and then some small packs for new data is a good thing
[18:30] <lifeless> jam-laptop: we'll generate that naturally as additional commits are made
[18:30] <lifeless> jam-laptop: having a single pack for lots of history works well
[18:31] <ubotu> New bug: #159089 in bzr "specific error if format strings have newline corruption" [Wishlist,Confirmed] https://launchpad.net/bugs/159089
[18:33] <jam-laptop> I wonder about having a big history pack, and then one pack with just the current fulltext heads
[18:34] <jam-laptop> but it is just hypothesising
[18:34] <jam-laptop> Anyway, I understand your point about not wanting to only write out the bad stuff
[18:34] <jam-laptop> since that means the old records are still around
[18:34] <jam-laptop> and you aren't sure which one a client will get
[18:34] <jam-laptop> so you would have to rewrite any pack which contained a bad record
[18:35] <jam-laptop> And at that point, you have to track what packs need to be processed, and it is certainly easier to just start from the beginning
[18:37] <siretart> jam-laptop: against what version of bzr is bzr-builddeb.dev supposed to work with?
[18:37] <siretart> james_w: : against what version of bzr is bzr-builddeb.dev supposed to work with?
[18:38] <siretart> jam-laptop: sorry, never mind. dammit tab completion :)
[18:38] <james_w> siretart: the one you just pulled?
[18:38] <siretart> yes
[18:38] <james_w> it should work with 0.92. I'm not sure when compatibility last broke though I'm afraid.
[18:39] <siretart> ok. the build-dependencies in debian/control imply it should work with 0.91, but it doesn't, because bzrlib.errors.UncommittedChanges is missing
[18:40] <james_w> oh, I didn't expect that.
[18:40] <james_w> I'll bump the dependencies.
[18:41] <siretart> james_w: http://paste.debian.net/41196
[18:41] <siretart> is the build error
[18:46] <ubotu> New bug: #159093 in bzr "TooManyConcurrentRequests while committing on bound branch" [Medium,New] https://launchpad.net/bugs/159093
[18:49] <lifeless> hi abentley
[18:50] <abentley> Hi there.
[18:51] <lifeless> any chance of a bzrtools release ?
[18:52] <abentley> lifeless: Sure.  I'll get that out today.
[18:52] <siretart> \o/
[18:53] <lifeless> thanks!
[18:54] <abentley> np
[18:54] <Peng> Hmmm.
[18:54] <Peng> I saw a typo in the knitpack.txt doc earlier, and I just went searching for it, and I couldn't find it, but I did find 4 or 5 more.
[18:55] <fullermd> Those were the decoys it meant you to find.
[18:55] <ubotu> New bug: #159098 in bzr "bad "bzr info" output on dangling branch reference" [Undecided,New] https://launchpad.net/bugs/159098
[19:02] <Peng> :(
[19:05] <Peng> I think I'm going to submit a patch for the typos. Mind if I fix whitespace too?
[19:06] <Peng> (I mean, remove whitespace from the ends of lines.)
[19:06] <lifeless> fine by me
[19:07] <Peng> Okies.
[19:07] <Peng> Ha! Now I have a mail client running! You can't stop me from sending patches!
[19:26]  * Peng wanders off.
[19:47] <gotgenes> I rebound my branch to the Subversion it was checked out from (and unbound from when I was waiting for bzr v0.92), but when I did a push I get a traceback
[19:47] <gotgenes> s/the Subversion/the Subversion repo/
[19:48] <gotgenes> SubversionException: ('Invalid diff stream: insn 0 cannot be decoded', 185003)
[19:48] <gotgenes> Nobody has access to the repo but myself so it hasn't changed since I checked it out
[19:49] <gotgenes> jelmer: Any ideas? Have you seen this error before?
[19:50] <gotgenes> I just did a bzr up and got the following message:
[19:50] <ubotu> New bug: #159103 in bzr ""bzr push" occasionally creates a branch reference instead of a branch" [Undecided,New] https://launchpad.net/bugs/159103
[19:50] <gotgenes> pending merges:
[19:50] <gotgenes>   Chris Lasher 2007-10-29 Moving all to legacy.
[19:51] <gotgenes> how do I enact the pending merges?
[19:59] <lifeless> gotgenes: 'enact' ?
[19:59] <gotgenes> lifeless: bzr enact?
[20:00] <gotgenes> lifeless: ah, no, sorry. To "go ahead" with the pending changes
[20:00] <gotgenes> "make it so"
[20:00] <gotgenes> "give the 'go ahead'"
[20:01] <dato> gotgenes: bzr commit
[20:02] <gotgenes> dato: any way to use my previous commit messages?
[20:03] <gotgenes> they're obviously stored somewhere because I was shown it when I did the bzr up
[20:03] <gotgenes> Obviously I can copy and paste, but just wondering
[20:04] <gotgenes> Well, I just did the commit and hit the same exception again
[20:04] <gotgenes> SubversionException: ('Invalid diff stream: insn 0 cannot be decoded', 185003)
[20:07] <lifeless> gotgenes: File a bug on bzr-svn please; jelmer should see it soon. I don't know what the bug is.
[20:07] <gotgenes> lifeless: will do
[20:19] <poolie> is the pack/ssh bug actually filed? can't find it...
[20:20] <gotgenes> I just filed Bug #159111 for bzr-svn.
[20:20] <ubotu> Launchpad bug 159111 in bzr-svn "bzr-svn can't push, commit to rebound SVN repository" [Undecided,New] https://launchpad.net/bugs/159111
[20:21] <jelmer> lifeless: please file a bug (bzr-gtk commit-notify inspect button)
[20:22] <jelmer> dato: please file a bug on that, with the bundle attached
[20:27] <fullermd> It'd be nice to be able to set a flag to tell merge "No, really, I will never ever care about changes to this file, so don't resurrect it on merge"
[20:43] <dato> jelmer: you want all issues mentioned in the same bug report?
[20:50] <ubotu> New bug: #159118 in bzr "can create a pack repository over bzr+ssh, but then not open it" [Low,Confirmed] https://launchpad.net/bugs/159118
[21:35] <jelmer> dato: All the ones you've fixed
[21:36] <jelmer> or just send me a bundle / branch url
[21:40] <mc_> hi im trying to get bzr working with CIA. im using this plugin https://launchpad.net/bzr-cia/  i already copied the directory into ~/.bazaar/plugins/cia/* and i set my cia user name. but now when i try to do bzr cia-project name i get the follwoin error "bzr: ERROR: unknown command "cia-project""
[21:41] <gotgenes> mc_: shouldn't you just copy the directory under ~/.bazaar/plugins/?
[21:41] <jelmer> mc_: does 'bzr plugins' list it?
[21:42] <mc_> hey you're they guy who wrote it jelmer (cool) :)
[21:42] <mc_> nope it doesnt
[21:44] <jelmer> mc_: so you have a file __init__ in ~/.bazaar/plugins/cia ?
[21:44] <mc_> jelmer: yes
[21:45] <jelmer> sorry, I meant __init__.py
[21:45] <mc_> of course,it's in there
[21:45] <mc_> the whole error message is "Unable to load plugin 'cia' from '/Users/mc/.bazaar/plugins'
[21:45] <mc_> invalid command name 'cia-project'"
[21:46] <jelmer> ah, so it's actually unable toload the plugin
[21:46] <mc_> ah im missing "compare_trees"
[21:47] <jelmer> mc_: where did you get your copy of bzr-cia ?
[21:47] <mc_> i executed __init__.py and it says that
[21:47] <mc_> jelmer: https://launchpad.net/bzr-cia/ I checked out trunk
[21:49] <jelmer> mc_: Strange, I can't find compare_trees in the source here anywhere :-/
[21:49] <poolie> lifeless, i guess we'll need to run reconcile in the bzr.dev repo?
[21:49] <poolie> and on vostok?
[21:49] <He1> I've got a setup at home where I do most of my work and I can sftp into where I store my branches no problem, however when I try to do it from my comp at work using bzr in windows (where I am right now) I get a 10013 error, I've set my firewall to allow ssh to the comp where I store my branches, and can access it fine via putty, but its no dice using bzr in windows, any help would great
[21:50] <mc_> jelmer: seems to be an bzrlib issue not specific to that plugin
[21:50] <mc_> Traceback (most recent call last):
[21:50] <mc_>   File "__init__.py", line 36, in <module>
[21:50] <mc_>     from bzrlib.delta import compare_trees
[21:50] <mc_> ImportError: cannot import name compare_trees
[21:52] <jelmer> mc_: I think you're using an older version - what exact URL did you branch from?
[21:52] <mc_> http://bazaar.launchpad.net/~jelmer/bzr-cia/main
[21:54] <jelmer> mc_: what files are in your local branch? just __init__.py ?
[21:54] <dato> jelmer: I'll file a separate bug for the rest, then
[21:54] <mc_> jelmer: README		__init__.pyc	setup.py
[21:54] <mc_> __init__.py	build		tests
[21:55] <mc_> hm,hope you can decrypt that....
[21:58] <dato> bug #159111
[21:58] <ubotu> Launchpad bug 159111 in bzr-svn "bzr-svn can't push, commit to rebound SVN repository" [Undecided,New] https://launchpad.net/bugs/159111
[21:59] <jelmer> mc_: ah, looks like launchpad is just out of date
[21:59] <jelmer> one sec
[21:59] <jelmer> dato: thanks
[22:01] <jelmer> dato: there's no bundle attached (yet)
[22:01] <mc_> jelmer: so i'll checkout the location directly then
[22:03] <jelmer> mc_: i've just updated the location to http://people.samba.org/bzr/jelmer/bzr-cia/trunk
[22:03] <lifeless> poolie: yes, when we switch them to the 0.92 code base running their commits
[22:04] <mc_> jelmer: still the same
[22:04] <mc_> Unable to load plugin 'cia_bzr' from '/Users/mc/.bazaar/plugins'
[22:04] <mc_> ImportError: cannot import name compare_trees
[22:05] <jelmer> mc_: what does "bzr revno ~/.bazaar/plugins/cia" say?
[22:06] <mc_> jelmer: 25
[22:06] <jelmer> mc_: Should be 29 if you pull from http://people.samba.org/bzr/jelmer/bzr-cia/trunk
[22:06] <dato> jelmer: now, seems launchpad can't accept attachments by email (bug #159140)
[22:06] <ubotu> Launchpad bug 159140 in bzr-svn "svn:date should be set to a UTC timestamp + wrong option name in	FAQ" [Undecided,New] https://launchpad.net/bugs/159140
[22:07] <jelmer> dato: Yeah, hit that bug a couple of times too :-/
[22:07] <jelmer> bug 30225
[22:07] <ubotu> Launchpad bug 30225 in malone "Attach files via email" [High,Confirmed] https://launchpad.net/bugs/30225
[22:08] <siretart> dato: if you can, feel free to upload bzr & bzrtools. I'm on very limited bandwith here, which makes updating my sid chroot painful :(
[22:08] <dato> oh. I'll subscribe to that. thx.
[22:08] <dato> siretart: sure, np. will do tomorrow.
[22:08] <mc_> jelmer:  working :)
[22:08] <mc_> jelmer: thank ya very much mate!
[22:08] <jelmer> no worries :-)
[22:14] <He1>  I've got a setup at home where I do most of my work and I can sftp into where I store my branches no problem, however when I try to do it from my comp at work using bzr in windows (where I am right now) I get a 10013 error, I've set my firewall to allow ssh to the comp where I store my branches, and can access it fine via putty, but its no dice using bzr in windows, any help would great, also go slow, I'm new to vcs and only know the basics of using ssh
[22:17] <jelmer> He1, no idea what a 10013 error is and perhaps nobody else here does
[22:18] <jelmer> please consider mailing the list, there are probably more people familiar with windows reading that
[22:18] <He1> its a permission denied error, when i googled it, it seemed to be a standardized error
[22:19] <He1> for multiple protocols
[22:19] <lifeless> jelmer: dato: It's being worked on, some months away though (attachments via email)
[22:20] <dato> ok
[22:22] <lifeless> (I just asked the manager of that area :))
[22:35] <ubotu> New bug: #159147 in bzr "pack progress bars incorrect" [Undecided,New] https://launchpad.net/bugs/159147
[22:42] <hendrixski> ummm..... when I try to install from the bazaar repositories, I get this message:   bzrtools: Depends: bzr (< 0.92~) but 0.92~rc1-1bazaar1 is to be installed
[22:42] <hendrixski> in feisty
[22:43] <hendrixski> looks like somebody put in a version of bzr that breaks the dependencies elsewhere... is there a way I can specify an earlier version with apt?
[22:43] <dato> hendrixski: try `apt-get install bzr=0.91-1`
[22:44] <dato> or if that doesn't work, do `apt-cache policy bzr`, and substitute the version for one that exists
[22:44] <hendrixski> k
[22:44]  * hendrixski tries those
[22:44] <dato> (or wait until bzrtoos 0.92 gets uploaded)
[22:45] <hendrixski> dato, sweet the first one worked.
[22:46] <hendrixski> cool, I didn't know you could do that with the equals sign :-p
[22:46] <dato> hendrixski: good :)
[22:46] <hendrixski> yay and now bzrtools installed too.  SUCCESS
[22:47]  * hendrixski hopes this will do more stuff than version .15 did (default in the Ubuntu Feisty Repo's)
[22:47] <hendrixski> dato, Happy Halloween :-)
[22:51] <ubotu> New bug: #159150 in bzr "co --lightweight connects mutiple times" [Medium,In progress] https://launchpad.net/bugs/159150
[23:56] <hendrixski> I'm having some trouble following this manual http://doc.bazaar-vcs.org/latest/en/mini-tutorial/index.html#publishing-your-branch-with-sftp  I set up a repository on an ftp server, but now I can't seem to put my changes up there :-(
[23:58] <beuno> hendrixski, what do you get when you try and push?