[02:36] <stopie> Hey all. Just learned of bazaar and find it to be a very vague concept in my mind and Ive done some looking for information on wiki and the bar webpage, and its not helping. I was wondering if anyone had a link to some information that might help explain how bzr does what it does and such. Thanks!
[02:46] <johnjosephbachir> stopie: have you used other SCMs before, like subversion or cvs?
[07:10] <devilsadvocate> hi. can someone point me to a document which describes why version control is required? I need to convince a team that its needed.. would be nice to have all the arguments in one place
[07:13] <cody-somerville> Theres a team that doesn't think its needed? :S
[07:13] <cody-somerville> http://ianclatworthy.files.wordpress.com/2007/10/dvcs-why-and-how3.pdf <-- heres a good resource
[07:32] <devilsadvocate> i really dont know what to do other than bang my head against a wall
[07:32] <lifeless> devilsadvocate: are you the team lead?
[07:32] <devilsadvocate> they want to do file renaming on ftp, etc
[07:33] <devilsadvocate> not the lead, but its my responsibility to make sure different parts of the system work together, etc
[07:33] <lifeless> devilsadvocate: well, if folk want to do it hard, and the lead agrees, just use bzr yourself
[07:33] <devilsadvocate> and i also am the one with the most experience in writng actual code, so i have a feeling i'll be doing a chunk of that work as well
[07:33] <lifeless> and show it off when ever a suitable time happens
[07:34] <lifeless> it will spread ;)
[07:34] <devilsadvocate> the suitable time has already happened
[07:34] <devilsadvocate> we ended up submitting a report that had different sections at different levels of recent, since it turned out people were editing different docs
[07:35] <devilsadvocate> and the argument that is used against it is that "we wont be able to make people wont use it"
[07:36] <devilsadvocate> cody-somerville, thanks for the link. it might just be enough to tip it over the edge (added to my threat of leaving the project)
[09:52] <bialix> garyvdm: ping
[09:52] <garyvdm> Hi Alex!
[09:53] <garyvdm> bialix: pong
[09:53] <bialix> hi Gary
[09:53] <bialix> can you teach me about qlog internals a bit?
[09:54] <garyvdm> Sure - Thats why I did that review - and did not just fix
[09:54] <bialix> thank you
[09:54] <bialix> in log.py I see method update_search
[09:54] <bialix> there is special code paths for revid and revno
[09:54] <bialix> do you want me to place tag filter there?
[09:55] <garyvdm> We could.
[09:55] <garyvdm> It depends on how you want it to behave
[09:56] <garyvdm> for revid and revno - we don't filter - we just jump to the revision - cause there will only ever be 1
[09:56] <bialix> my intent to provide the search for specif tags
[09:57] <garyvdm> For tag - your search might
[09:57] <garyvdm> brb
[09:57] <garyvdm> sorry - I'll be back in 10 min
[09:57] <bialix> btw, search for tags has one weak place: if tag in merged revision then it still collapsed. how can I force it to be visible?
[09:57] <bialix> ok
[10:05] <rusty> Dumb q: what's the best way of showing a change, ie. log + diff?
[10:05] <bialix> log -p
[10:06] <rusty> bialix: not in 1.6.1?
[10:06] <bialix> rusty: nope
[10:07] <bialix> upgrade?
[10:08] <bialix> garyvdm: perhaps I understand your suggestion: I need to use self.sr_index_matched_revids dict, and fill it with matching keys. Is that right?
[10:08] <rusty> bialix: thx, but sticking with ubuntu default pkgs.
[10:17] <garyvdm> bialix: Yes- if you want to filter.
[10:17] <bialix> btw, there is something strange
[10:18] <garyvdm> For revno, revid - we select, and not filter.  For message, author, we filter
[10:18] <bialix> you're using self.sr_filter_re and self.sr_filter_regex in the same time
[10:18] <bialix> in constructor you define self.sr_filter_re
[10:18] <garyvdm> Oh
[10:18] <bialix> it seems like a typo or bug
[10:19] <garyvdm> self.sr_filter_re is the one that gets used. I'll fix that though.
[10:21] <bialix> I have working filter for tags: http://pastebin.com/m4a3a752c
[10:21] <bialix> garyvdm: how can I force merged revision to be visible?
[10:21] <garyvdm> Ah
[10:22] <bialix> um?
[10:23] <garyvdm> http://pastebin.com/d2cb3b507
[10:24] <garyvdm> You need to set self.branch_lines[branch_id][1] = True
[10:24] <garyvdm> For the revisions, and the revisions that merge them
[10:24] <garyvdm> recursively
[10:25] <bialix> oh
[10:25] <bialix> it will play badly with multiple branches?
[10:26] <garyvdm> No
[10:26] <garyvdm> See invaladate_filter_cache_revs to see how I find the revisions that merge them.
[10:27] <garyvdm> back in 1min
[10:28]  * bialix -> lunch, back in 20 min
[10:35] <garyvdm> bialix: Please don't use sr_index_matched_revids. Create a new field, say sr_tag_matched_revids
[10:37] <bialix> why?
[10:43] <garyvdm> bialix: To make it easier to understand / read.
[10:44] <garyvdm> It will work just as well if you don't.
[10:47] <bialix> will do
[10:47] <bialix> I'll send the patch for review
[10:49] <Tecan> how would i check this repository out ? https://launchpad.net/alarmclock
[10:50] <lifeless> typically you can just do bzr branch lp:alarmclock
[10:52] <Tecan> cool it worked ;)
[10:52] <Tecan> but with a dash in it
[10:52] <Tecan> alarm-clock
[10:53] <Tecan> i'm starting to like bzr alot. the website looks/works like a few million dollars
[13:13] <xiaohui> hi, I am a newbie of bzr, could some tell me how to make a patch
[13:13] <xiaohui> which command should I use
[13:21] <jpds> xiaohui: 'bzr diff' will show you what uncommited changes you have.
[13:22] <jpds> You can redirect it to a new file with: bzr diff > my_patch1.diff
[13:25] <xiaohui> oh , thank you jpds
[13:26] <luks> or better, commit them and use: bzr send -o mypath.diff
[13:27] <jpds> luks: Oh, did not know that, thanks.
[13:27] <luks> this is dvcs, offline commits are one of it's main point :)
[13:28] <luks> and if the upstream is using bzr, they can just use bzr merge/pull mypatch.diff
[13:37] <xiaohui> jpds: I have done as your said , but I havn't seen the patch show the info about the added file
[13:37] <bob2> welcome to patches
[13:37] <bob2> what's the patch for?
[13:38] <luks> xiaohui: did you 'bzr add' the file?
[13:38] <luks> and seriously, use bzr send
[13:38] <xiaohui> oh  luks , I haven't do that
[13:39] <xiaohui> I just used the bzr from this moring
[13:40] <luks> the usul way of contributing patches to a project using bzr is to branch the remote branch, work on the branch, make a commit, bzr send the resulting patch
[13:40] <luks> the patch produced by bzr send will then contain your name, the commit message, etc.
[13:41] <luks> and the maintainer will just merge it like if it was a normal branch
[13:41] <luks> *ussual
[13:41] <luks> bah, I can't type
[13:43] <xiaohui> it works, thank you guys
[13:43] <xiaohui> I will read the document later
[13:56] <magcius> How do I change the default push location for a branch?
[13:57] <bob2> edit .bzr/branch/branch.conf or bzr push --remember somethingelse
[13:57] <magcius> Is the --remember switch documented?
[13:59] <bob2> bzr help push
[15:48] <jrib> hi, is there a gui frontend for bzr on os-x?  I want to use bzr on a project, but I need to provide a nice gui for my friend on os-x or he will refuse :)
[16:08] <jrib> Is there some way to configure bzr so that if I do « bzr branch foo », then it remembers the parent branch as the push location so that I can do « bzr push » without having to specify where I want to push?  In short, I want to be able to do: « bzr checkout foo; *hack*; bzr push », instead of: «bzr checkout foo; *hack*; bzr push foo »
[16:08] <jrib> erm.  s/checkout/branch
[16:09] <bob2> no
[16:10] <jrib> Is there a reason other than "no one has contributed the code" why that is?  Or at least why a configuration setting does not exist?
[16:32] <cody-somerville> jrib, probably to prevent accidental pushing
[16:32] <cody-somerville> jrib, however, I'm pretty sure checkout does remember. Infact, with a checkout, when you commit, you're committing to the remote branch
[16:32] <cody-somerville> Whereas branch is actually creating a new branch that you commit to
[16:35] <jpds> jrib: bzr push :parent
[16:46] <cody-somerville> thats a neat trick
[16:53] <jrib> jpds: that will do, thanks
[16:53] <jpds> 'tis a nifty shorthand, true. :)
[17:03] <jrib> is there a gui frontend for bzr in os-x?
[17:10] <cody-somerville> I think there is good bzr integration with netbeans
[17:10] <jpds> jrib: Looks like QBzr runs on it: http://bazaar-vcs.org/MacOSXBundle
[17:11] <jrib> thanks again
[18:02] <BlackLukes> hi, I added a .bzrignore file in my project directory and typed on the terminal "bzr ignore ./config.cfg"
[18:02] <BlackLukes> but I got this: "Warning: the following files are version controlled and match your ignore pattern: config.cfg"
[18:02] <BlackLukes> if I write bzr ignored, config.cfg is not showed. what should I do to ignore it?
[18:04] <LarstiQ> BlackLukes: euh
[18:05] <LarstiQ> BlackLukes: the warning tells you that the file is under version control
[18:06] <LarstiQ> BlackLukes: in which case, even if it matches an ignore rule, it will not be ignored.
[18:06] <BlackLukes> I have to keep it under version control but it should ignore changes
[18:06] <LarstiQ> that doesn't make a lot of sense
[18:06] <LarstiQ> BlackLukes: if you're not interested in versioning it, why keep it under version control?
[18:07] <BlackLukes> no it's not that case
[18:08] <BlackLukes> I have a configuration file that shouldn't change if a developer commit a changes to other files that automatically changes the configuration file (it's system dependent)
[18:10] <LarstiQ> BlackLukes: so, why does it need to be versioned in the first place then?
[18:11] <BlackLukes> I have to keep the default value every time the application run.. if a developer commit a change, the conf file is changed so I have to manually change the conf file to default values
[18:12] <LarstiQ> BlackLukes: ignores do not work the way you seem to want to use them, and I don't completely understand your situation so have trouble recommending a solution
[18:13] <BlackLukes> yeah you're right, it's very difficult to explain and maybe it's even an incorrect thought. I'll try to do a code workaround
[18:15] <stbuehler> just rename the file in version control to "config.cfg.default"
[18:17] <BlackLukes> and then I have to put under version control.. but what if I want to keep it unchanged?
[18:22] <LarstiQ> BlackLukes: as stbuehler said, a common pattern with config files is to version a template, copy that to something unversioned (and ignored), changes to that won't propagate
[18:24] <BlackLukes> ah yeah that make sense
[18:24] <BlackLukes> thanks, I'll do in this way
[18:24] <LarstiQ> BlackLukes: ok, I hope that solves your use case :)
[18:25] <stbuehler> another idea (if you have "include" available for your configs), is to have a versioned "config.default" and a "config"; the "config" includes "config.default" and tries to include "config.custom" if it exists
[18:27] <BlackLukes> yeah, another good way. I think I can do this also through code
[19:38] <Flare-laptop> How can I fix these errors: http://flare183.pastebin.ca/1375983
[19:41] <SamB> [#|                  ] None ?   3257KB    24KB/s | copying revision 176/2287
[19:41]  * SamB wonders if he needs to pull a new version of bzr-svn
[19:42] <SamB> Flare-laptop: did you actually install bzr?
[19:42] <Flare-laptop> SamB: Yeap
[19:42] <SamB> where is bzrlib?
[19:42] <Flare-laptop> And it gives me this crap too: ImportError: Bad magic number in /usr/lib/python2.5/site-packages/bzrlib/__init__.pyc
[19:42] <SamB> OH
[19:43] <SamB> maybe try reinstalling?
[19:43] <Flare-laptop> ...
[19:43] <Flare-laptop> Ok, I'll try that
[19:43] <Flare-laptop> fail
[19:43] <Flare-laptop> It still gives me the same error
[19:43] <SamB> still bad magic number?
[19:43] <Flare-laptop> Yeap
[19:43] <SamB> that's not good
[19:44] <Flare-laptop> Yeah I know
[19:44] <Flare-laptop> It works fine on my Ubuntu Laptop, but not on my Arch Linux Server
[19:44] <Flare-laptop> :(
[19:44] <SamB> % python --version
[19:44] <SamB> what's the output for you?
[19:44] <Flare-laptop> Python 2.6.1
[19:44] <SamB> oh.
[19:44] <Flare-laptop> I have BOTH python 2.5 and 2.6 installed
[19:44] <SamB> and what is the shabang line on bzr?
[19:45] <Flare-laptop> Sorry for the cpas
[19:45] <Flare-laptop> caps*
[19:45] <Flare-laptop> shabang?
[19:45] <SamB> the first line
[19:45] <SamB> it has a "#!" at the beginning
[19:45] <Flare-laptop> I'm confused
[19:46] <SamB> i.e., run "head $(which bzr)"
[19:46] <SamB> read off the first line
[19:46] <Flare-laptop> oh ok
[19:46] <Flare-laptop> hold on
[19:46] <Flare-laptop> Output: http://flare183.pastebin.ca/1375998
[19:47] <Flare-laptop> SamB: ^^
[19:48] <SamB> okay ... so it looks like you have python 2.6 trying to load bytecode compiled by python 2.5
[19:48] <Flare-laptop> Yeah, and I'm also having problems with my supybot not wanting to load either
[19:48] <SamB> out of the python 2.5 library directory, no less ...
[19:48] <Flare-laptop> Same problem too, I think
[19:49] <SamB> what does "echo $PYTHONPATH" tell you?
[19:49] <SamB> oh, btw, this is the shabang line:
[19:49] <Flare-laptop> Ok, here is stupid part; when I go to install supybot, it installs python2.6
[19:49] <SamB> #!/usr/bin/python
[19:49] <Flare-laptop> hold on
[19:49] <Flare-laptop> ahh ok
[19:49] <SamB> called that because it starts with a sharp and a bang
[19:49] <SamB> (# and !)
[19:49] <Flare-laptop> lol like crunchbang
[19:50] <Flare-laptop> whoa wt*
[19:50] <Flare-laptop> [jesse@flare183 ~]$ echo #PYTHONPATH
[19:50] <Flare-laptop> [jesse@flare183 ~]$
[19:50] <Flare-laptop> There's nothing there!
[19:50] <SamB> er, $, not #
[19:50] <Flare-laptop> oops
[19:50]  * Flare-laptop facepalms
[19:50] <SamB> hehe
[19:50] <Flare-laptop> :S
[19:50] <Flare-laptop> Same thing
[19:51] <SamB> oh, okay
[19:51] <SamB> that is very wierd ...
[19:51] <Flare-laptop> I agree
[19:51]  * Flare-laptop wishes he had enough RAM to install Ubuntu Server
[19:51] <garyvdm> jam: Please can I chat to you about Bug 350796?
[19:51] <SamB> maybe you should ask in a forum (channel, mailing list) for Python on Arch
[19:52] <Flare-laptop> alright
[19:59]  * SamB wishes the gcj runtime library on Debian was in smaller pieces ...
[20:01] <Flare-laptop> SamB: But what exactly should I say/put on the forums?
[20:46]  * cody-somerville pouts at how difficult git is.
[20:47]  * cody-somerville huggles his bzr.
[21:41] <magcius> Why does bzr try to push through http on Windows?
[21:42] <magcius> Instead of through bzr+ssh?
[21:42] <magcius> Is pushing through http even possible (Launchpad here)
[21:42] <jelmer> magcius: are you specifying a http:// url?
[21:42] <magcius> jelmer, lp:*
[21:42] <jelmer> magcius: it will use http:// if you haven't logged in
[21:43] <jelmer> try "bzr lp-login"
[21:47] <magcius> jelmer, he tried it.
[21:57] <magcius> bzr noobie here
[21:57] <magcius> I did a bzr pull, now how do I merge the changes with the local working copy?
[21:57] <jelmer> magcius: bzr pull will automatically update the working tree
[21:58] <magcius> jelmer, hmm...
[21:58] <magcius> jelmer, it didn't appear to change anything in emacs.
[22:10] <magcius> jelmer, bzr says to use "merge" then "push". Even after I do that it does the same thing.
[22:10] <magcius> jelmer, oh, I had to merge, commit, then push.
[22:11] <magcius> Just a usability issue, that's all.
[22:11] <jelmer> magcius: "bzr pull" only works if you are behind on the branch you're pulling from, not if you have any local commits
[22:12] <jelmer> if you have any additional commits locally, you have to merge
[22:12] <magcius> jelmer, yeah, I fixed the pull issue. I am trying to push, it said to "merge" then "push"
[22:12] <magcius> I had to merge, then commit, then push.
[22:12] <magcius> Just an unhelpful error message, that's all.
[22:45] <magcius> Is there a quick how-to on bzr merging?
[22:53] <stbuehler> jelmer: just wanted to give some feedback: bzr dpush does *not* give you the svn-revisions back, even if you had new commits pushed to upstream svn
[22:54] <stbuehler> perhaps that works if you never used the normal push, didn't try that
[22:54] <bob2> magcius: maybe in the user's guide - it's mostly just a matter of 'merge, fix any conflicts, commit', though
[22:56] <lifeless> jelmer: ping
[22:59] <lifeless> jml: ping
[22:59] <jml> lifeless: pong.
[22:59] <jml> lifeless: I'm on a call with thumper at the moment.
[22:59] <lifeless> I have a tiny review I'd like done when you can - lp:subunit, the polish branch. Its a no-brainer
[23:00] <lifeless> I just got a mail titled 'using SubUnit for Python on Parrot' :)
[23:39] <jelmer> lifeless: moin
[23:39] <jelmer> lifeless: one sec
[23:44] <lifeless> jelmer: hi
[23:44] <lifeless> jelmer: subunit, you put up an RFP
[23:44] <jelmer> lifeless: ah, yeah
[23:46] <lifeless> jelmer: its come a ways since then, and with my polish branch installs correctly AFAICT
[23:46] <jelmer> lifeless: did you request a merge or anything for the polish branch?
[23:46] <lifeless> yes
[23:46] <jelmer> lifeless: since I didn't see any email yet
[23:47] <lifeless> are you suscribed to trunk for reviews
[23:47] <jelmer> ah, probably not
[23:48] <lifeless> https://code.edge.launchpad.net/subunit/+activereviews
[23:48] <jelmer> thanks
[23:49] <jelmer> hmm, subunit developers is the standard reviewer for lp:subunit
[23:49] <lifeless> subscribe to trunk
[23:49] <lifeless> the default subscribtion status changes when reviews were added
[23:49] <lifeless> s/changes/changed/
[23:50] <lifeless> existing subscriptions were not updatd
[23:53] <jelmer> ahh