[04:26] <Noldorin> hi jelmer
[04:26] <Noldorin> what's up?
[05:18] <jimis> Hello
[05:19] <jimis> Is there a way for "bzr log -p" to display diffs using specific diff flags?
[05:24] <jimis> In particular I want diff -p
[05:51] <jimis> hmmm I'm trying to do "bzr diff -cREV1 -cREV2" to get a diff containing various sparse changes, but it seems it doesn't understand that
[06:48] <vila> hell o guys !
[07:12] <vindolin> when i click on the icon before modified items in the overview, the diff window briefly opens and closes immediately.. on the console i get: bzr: ERROR: Path(s) are not versioned: __init__.py
[07:12] <vindolin> ^ bzr explorer
[07:19] <Merwin> I've got a problem, I made a mistake a switched to a repo I didn't want to. So, I removed the directory. But now, bzr considers I'm still in the repo...
[07:20] <Merwin> thibaut@thibaut-VirtualBox:~/OpenERP 6/Logica/addons-opas$ bzr status
[07:20] <Merwin> bzr: ERROR: Not a branch: "/home/thibaut/OpenERP 6/Logica/addons-opas/trunk/".
[07:20] <Merwin> Of course, the trunk/directory is deleted
[07:20] <Merwin> I'm using a colo-branches repo, but switch to colo:xxx doesn't work
[07:21] <Merwin> Like if my repo was broken. How can I change the branch I'm currently in ?
[07:25] <Merwin> (Trying to bzr switch somewhere else give me the same error: Not a branch)
[07:41] <vila> Merwin: did you try the '--force' parameter for switch ?
[07:41] <Merwin> vila: I'll try
[07:42] <Merwin> It works, thank you ;)
[07:46] <vila> Merwin: great
[07:47] <vila> vindolin: make sure you use the latest versions of bzr/qbzr/bzr-explorer and if the problem persists, file a bug: http://pad.lv/fb/bzr-explorer
[07:47] <vila> maxb: bzr -2.4.0 all over the place ? \\0 \o/ 0//
[07:49] <vila> jelmer: so, https://bugs.launchpad.net/bzr-svn/+bug/826946 is still a blocker ?
[07:51] <jam> morning all
[07:52] <vila> hi jam !
[09:18] <maxb> vila: ?
[09:19] <vila> maxb: celebrating 2.4.0 in the stable ppa ;)
[09:40] <jelmer> sigh, just had a kernel panic. It's been a while since I've seen one of those.
[09:48]  * vila kills a goat
[09:48] <jelmer> vila: :)
[09:50] <vila> jelmer: so, https://bugs.launchpad.net/bzr-svn/+bug/826946 is still a blocker ?
[09:51] <jelmer> vila: yes, I have a better idea of what's happening there now though
[09:51]  * vila nods
[09:51] <vila> I've read your last comments
[09:51] <vila> jelmer: any help needed ?
[09:53] <jelmer> any suggestions on what's actually happening would be most welcome :)
[09:55] <vila> ha, that's harder  :-/
[09:56] <vila> you said 'http-specific', any details ?
[09:57] <jelmer> not at this point
[09:57] <jelmer> it just seems like all revisions are pushed with empty details
[09:58] <jelmer> in theory the external users of the svn library shouldn't really care about the transport, but in practice there are a couple of quirks
[09:58] <jelmer> the bzr-svn testsuite only uses file://
[12:48] <jimis> Is there a way for "bzr log -p" to display diffs using specific diff flags?
[12:57] <vila> jimis: not that I know of from the command line, writing a plugin to define a specific log format will give you access to all the control you want though
[13:23] <Merwin> Hey guys, when using Bazaar Explorer to merge using meld on Ubuntu, when I save my .THIS file. Am I doing something wrong ? WHich one will be my "final" file ?
[13:23] <Merwin> I'm using meld to do the merge
[13:23] <Merwin> Opps, some words are missing : When I save my file with meld, merge markups are not removed from the file.
[13:24] <Merwin> So, maybe I'm not editing the good one, which one should I edit ?
[13:25] <jelmer> hi Merwin
[13:25] <Merwin> hi jelmer :)
[13:25] <jelmer> Merwin: I think you need to edit the regular file using meld, but I'm not entirely sure (I don't have experience with meld)
[13:26] <Merwin> What do you use ? If you have a better tool, lemme know !
[13:28] <Merwin> Currently, Meld opens a 3-file view, with .BASE, .THIS and .OTHER. I'm editing the .THIS file.
[13:29] <jelmer> Merwin: I just use a regular editor to resolve conflicts
[13:30] <jelmer> s/use/using/
[13:30] <Merwin> ok
[13:39] <Merwin> jelmer: I don't understand. From what I read here : http://doc.bazaar.canonical.com/latest/en/user-guide/resolving_conflicts.html#resolving-a-conflict we have to edit the three files
[13:39] <Merwin> Why would I do this ?
[13:42] <jelmer> Merwin: you don't have to edit the tree files
[13:43] <jelmer> Merwin: you can either edit the main file and resolve the conflicts there, overwrite it with .OTHER or .THIS (if you want to keep one side of the merge only),)
[13:44] <Merwin> So, if .OTHER is the merge version, and .THIS my version, what is .BASE ?
[13:44] <jelmer> Merwin: .BASE, .THIS and .OTHER are there so you can copy them over the main file, or e.g. run "diff" between them to see what has changed, use your favorite merge resolve tool (like meld))
[13:44] <jelmer> Merwin: .BASE is the base version from the 3-way merge; the merge works by applying all of the difference between .BASE and .OTHER to your version
[13:45] <Merwin> hum
[13:47] <jelmer> (roughly speaking)
[13:48] <mgz> you don't generally edit any of those three files, you edit the original
[13:54] <jelmer> maxb: hi
[13:54] <maxb> hi
[13:54] <jelmer> maxb: where was the problem with the bzr-builddeb test suite exactly?
[13:54] <maxb> test_repack_tarball IIRC
[13:54] <maxb> The failures should be clearly visible in the daily PPA
[13:54] <jelmer> yeah, but what was the issue?
[13:55] <jelmer> I know which tests are failing :)
[13:55] <maxb> The issue was that it was trying to open an on-disk path that happened to contain ( ) characters, and it was trying to open them as %28 %29
[13:55] <jelmer> ah, ok
[14:18] <Riddell> ug, I just had a random X crash, haven't had that in ages, something crashy in the air today
[14:20] <jelmer> Riddell: ouch
[14:21] <Riddell> must be solar flares or the like
[14:21]  * vila kills another goat
[14:22]  * jelmer wonders where vila finds all those goats in the city centre of Strasbourg
[14:22] <vila> jelmer: courtesy of fullermd
[14:23] <fullermd> Aiee!  My goat!
[14:23]  * fullermd runs out the door to a meeting.
[14:54] <jimis> How do I tell to "bzr merge -c" to get the last changeset from target branch?
[14:54] <jimis> is it -c-1?
[15:01] <jelmer> jimis: yes
[15:04] <jimis> thanks
[15:05] <jimis> jelmer: nope, it brought some other changeset, which had various conflicts
[15:05] <jimis> luckily I used --preview :-)
[15:06] <jelmer> jimis: It will only merge that change, but that change obviously depends on previous changes, which might cause conflicts.
[15:06] <jimis> It's in the same file with other changes, but really far away from them
[15:06] <jimis> is there a way to bring the patch from only that revision?
[15:07] <jimis> jelmer: I think it brought the one before the tip, not the tip (the last one)
[15:07] <jelmer> jimis: -c -1 is the changes made for the last revision
[15:08] <jelmer> jimis: see also "bzr diff -c -1"
[15:09] <jimis> ah thanks
[15:10] <jimis> strange that it had all these conflicts
[15:11] <jimis> so I'll just apply the diff
[15:11] <jimis> but it doesn't look right, conflicts should be only when changes overlap :-s
[15:46] <smoser> Anyone know where these messages come from:
[15:46] <smoser>  Packaging branch version: 5.3.2-1ubuntu4.5
[15:46] <smoser> Packaging branch status: OUT-OF-DATE
[15:46] <smoser> I *really* like them.  It might be useful if they provided a link to http://package-import.ubuntu.com/status/ also
[15:51] <jelmer> smoser: jam added them recently, they come from a hook in the bzr launchpad plugin
[15:51] <jelmer> smoser: wrt the package-import link, please file a bug :)
[15:52] <smoser> jelmer, will-do.
[15:52] <smoser> then, even better would be to not fail the importer
[15:52] <smoser> ;-)
[15:53] <smoser> what source package is that ?
[15:53] <smoser> is it just bzr ?
[15:53] <jelmer> smoser: yup, it's a plugin bundled with bzr
[15:54] <smoser> k. so file bug against bzr project
[15:54] <smoser> thanks
[15:56] <smoser> jelmer, bug 831428
[15:57] <jelmer> smoser: merci
[15:58] <jimis> when merge --preview outputs nothing, it means the branch is already merged?
[15:58] <jelmer> either that, or there are no changes to merge
[16:00] <jimis> Is there another way to see which branch is merged where, without using a gui?
[16:03] <jelmer> jimis: "bzr missing"
[16:04] <jimis> thanks jelmer, very helpful!
[16:08] <vila> jelmer: looks like your fir for testtools-0.9.2 is not part of bzr-2.4 ?
[16:08] <jimis> jelmer: and can I see where exactly a merge happened, and at what revision were both trees? log doesn't help, any parameters I'm missing?
[16:09] <vila> jimis: bzr log -n0 ? (+ --limit=nnn if needed)
[16:09] <jelmer> vila: yeah, though it's cherrypicked to the relevant debian/ubuntu package
[16:10] <jimis> I've tried log -n0 -v, but output is not clear about merges
[16:10] <jimis> I'll check it again
[16:10] <vila> jimis: yeah, bzr log output is an acquired taste, but really for moderately complex histories, you'd better try bzr qlog (from the qbzr plugin)
[16:11] <vila> jelmer: hmm, so if we ever upgrade pqm confusion will ensue :-/
[16:11] <jimis> :-( unfortunately gui access isn't a choice
[16:12] <vila> jimis: huh ? how come ? remote access ?
[16:12] <jimis> yeap
[16:12] <vila> >-(
[16:12] <jimis> and user access only, not root
[16:13] <vila> goes without saying... :-(
[16:13] <jimis> so even if I did compile my own python etc to be able to run bzr 2.4
[16:13] <vila> jimis: I don't fully understand your use case but bzr log --exclude-common-history may help you at one point
[16:13] <jimis> I don't have devel libraries to build gui packages, it would be too much hassle to do them from start...
[16:13] <vila> jimis: OS ?
[16:13] <jimis> vila: ok I'll try it thans
[16:14] <jimis> RHEL5 ;-)
[16:14] <vila> eeesh
[16:16] <jimis> bzr: ERROR: --exclude-common-ancestry requires -r with two revisions
[16:16] <jimis> it would be cool to understand I mean current branch versus parent branch :-p
[16:16] <jimis> anyway :-)
[16:19] <vila> jimis: bzr log -rancestor:.. ?
[16:23] <jimis> vila: it was only a "bzr log --exclude-common-ancestry". I was expecting to exclude common history of current and parent branches.
[16:24] <vila> jimis: ha ! Oh, but it has far more uses and requires a revision range anyway
[16:26] <Noldorin> hi jelmer
[16:26] <jelmer> hi Noldorin
[16:26] <Noldorin> jelmer, i noticed collocated branches are now supported in bzr :-)
[16:26] <Noldorin> at least the beta
[16:28] <Noldorin> jelmer, still had no time to investigate my particular issue with my branch....been busy on holiday
[16:28] <Noldorin> but soon
[16:28] <Noldorin> shall be back shortly
[16:43] <Noldorin> jelmer, but at least i can start testing with GitHub i guess?
[16:43] <Noldorin> multiple branches
[16:43] <jelmer> Noldorin: yeah
[16:43] <Noldorin> jelmer, cool. which releases of each do i want to use?
[16:43] <Noldorin> bzr, bzr-git, dulwich that is
[16:48] <jelmer> Noldorin: tip of all three
[17:19] <Noldorin> jelmer, no releases in either yet?
[17:19] <Noldorin> err
[17:19] <Noldorin> any
[17:19] <jelmer> Noldorin: nope
[17:19] <Noldorin> jelmer, when do you anticipate them?
[17:19] <Noldorin> jelmer, i though bzr 2.5b1 has collocated branches support now...
[17:19] <jelmer> I guess dulwich 0.8.0 is sufficient, but bzr-git and bzr will be a while (about a month I guess)
[17:20] <jelmer> Noldorin: 2.5b1 isn't out yet
[17:20] <Noldorin> okay
[17:24] <Noldorin> jelmer, are you timing a new release of bzr-git/dulwich for around 2.5b1 release time?
[17:24] <jelmer> Noldorin: depends on if there are any other worthwile fixes at that point
[17:24] <Noldorin> i see
[17:25] <Noldorin> jelmer, so maybe i should get working on that bzr-git bug when i return :-)
[17:25] <Noldorin> the git database issue i guess
[17:25] <jelmer> Noldorin: what's the problem with running a snapshot?
[17:25] <jimis> What log -n0 does is that is shows subrevisions that came with merges?
[17:25] <Noldorin> jelmer, nothing, i'm just curious :-P
[17:25] <Noldorin> but also, are there windows binary builds for bzr 2.5b1?
[17:26] <jelmer> there probably will be
[17:26] <Noldorin> ok cool
[17:32] <Noldorin> will have a look before long
[17:32] <Noldorin> brb for now
[19:47] <CrazyLemon> hey guys..one quick question..is it possible to pull specific files instead of whole branch ?
[19:47] <CrazyLemon> folders*
[23:01] <poolie> hi all
[23:14] <maxb> poolie: Hi. You seem to have a forgotten vim session on jubany
[23:21] <niemeyer> Hey all
[23:21] <niemeyer> Who's the bzr MacOS master?
[23:22] <jelmer> hi niemeyer
[23:22] <jelmer> niemeyer: probably doxx, though I don't see him around at the moment.
[23:22] <niemeyer> jelmer: Yo
[23:22] <jelmer> niemeyer: what's up?
[23:22] <niemeyer> jelmer: COol.. I just got a note from a friend saying the MacOS bzr fails when unpacking
[23:22] <niemeyer> He thinks it might be on his side, but not quite sure, so I figured it might be good to at least ping the maintainer
[23:23] <poolie> hi maxb, niemeyer
[23:23] <poolie> maxb, does it have something locked? i'll close it
[23:23] <niemeyer> poolie: Hey!
[23:24] <niemeyer> https://plus.google.com/109174220542239592378/posts/Pbhi9XB69uV
[23:24] <jelmer> niemeyer: FWIW I don't see anything related in the bzr-mac-installers lp project bugs, so it'd indeed be good to check with doxx
[23:24] <poolie> maxb, should be ok now
[23:24] <maxb> poolie: Thanks. Also, are those local mods to import_package.py yours?
[23:25] <jelmer> also, hi poolie, maxb
[23:26] <niemeyer> jelmer: Cool, thanks
[23:27] <poolie> they are; let me see about cleaning them up
[23:27] <poolie> hm
[23:28] <poolie> at the moment i have it tweaked to get the branch using lp.load rather than branches.getByURL
[23:28] <poolie> the latter is probably better, and i think it's now in trunk