[05:53] mwhudson: fullermd: that delta module is -firmly- deprecated [08:59] jelmer, hello? [09:39] vila, could you give me a ping if you've got time to talk about RT#50151: setup pqm to resolve news conflicts for bzr [09:39] ? [09:47] gnuoy: ping [09:47] gnuoy: are you in budapest ? [09:48] vila, no, I'm afraid not [09:48] k, no worries [09:48] :) [09:48] I've got 2 relevant files, /srv/pqm.bazaar-vcs.org/pqm-config/pqm.bazaar-vcs.org.conf and /home/pqm/.bazaar/locations.conf [09:48] The /home/pqm/.bazaar/locations.conf has very little in it [09:48] https://pastebin.canonical.com/57866/ [09:49] The main config is in /srv/pqm.bazaar-vcs.org/pqm-config/pqm.bazaar-vcs.org.conf... [09:49] the former is probably irrelevant (or rather specific to pqm and unknown to bzr) [09:50] fwiw, it contains: https://pastebin.canonical.com/57867/ [09:50] I assumed pqm.bazaar-vcs.org.conf was the relevant file [09:52] for pqm yes [09:52] given those 2 files does the change need to go into /home/pqm/.bazaar/locations.conf then ? [09:52] yup [09:52] vila, ok, thats simple then [09:52] :) [09:53] my bet would be that {workdir} is relevant as the highest section name we want to use [09:53] as in: that's probably below this dir that the merges occur [09:54] gnuoy: moving to a new room... [09:55] vila, the chroot is under /srv/pqm.bazaar-vcs.org/chroot so is this what I need to add ?: https://pastebin.canonical.com/57868/ [09:57] I'll add home/pqm/pqm-workdir (without a final /) [09:58] just to make sure it applies to bzr only (even if bzr is not mentioned there...) [09:58] What's the default branch for ancestor: ? [10:01] AfC: ancestor: applies to a branch, I don't get what default you're after O_o [10:01] I should be missing your context [10:01] vila: I just did [10:01] $ bzr diff -r ancestor: [10:01] vila: and it did something. I just don't know what branch it did it against. [10:02] the current one in the directory you ran bzr diff [10:02] bzr info should tell you [10:02] vila: bzr info says the usual useless information, like "parent" and "submit" like I'd know what the difference is [10:03] submit_branch is probably relevant [10:03] vila: ie it doesn't mention "ancestor" [10:03] vila, so the entry should be https://pastebin.canonical.com/57869/ ? [10:03] parent is where you branch from, submit is where you merge from [10:04] so 'parent' should be more relevant than 'submit', sorry [10:04] vila: excellent. [10:04] vila: we are, regrettably, no closer to knowing what the definition of ancestor: is. [10:05] gnuoy: yup, that sounds good [10:05] vila: [not your fault, just a lack of polish in bzr command line interface] [10:06] AfC: I'm using submit: far more than ancestor: myself [10:06] vila: been using ancestor:/path/to/whatever for years. [10:06] vila: no one told me I wasn't supposed to use it. [10:07] the subtle distinction between them is... not always clear to me [10:07] heh [10:07] in most of the cases I know they give the same results [10:07] er. wait [10:07] vila: ancestor: is a calculation [10:07] vila: submit: is just a tip [10:07] right? [10:08] especially for branches that have far diverged [10:08] well, 'ancestor' is where you came from, 'submit' is where you want to go [10:08] so the resulting diff is often the same [10:09] ah, interesting [10:09] I thought submit was a location [10:09] in fact, it is something in bazaar.conf [10:09] whereas, [10:10] $ bzr help revisionspec [10:10] ... [10:10] submit: [10:10] Selects a common ancestor with the submit branch. [10:10] ancestor: [10:10] Selects a common ancestor with a second branch. [10:10] wtf [10:10] oh, right [10:10] true, but as far as diff is concerned, they both provide a revision [10:10] the whacked out [10:10] difference between [10:10] :submit and -r submit: [10:12] the former is a location, the later is the tip of this location (i.e. a revision) [10:16] gnuoy: should I throw a test at pqm ? [10:17] vila, yes pls [10:18] gnuoy: done, waiting for result [10:20] gnuoy: tests didn't start so probably still failing :-/ [10:20] gnuoy: can find some log about the latest bzr pqm submission so we can check which dirs/branches were involved ? [10:20] s/&/you/ somewhere ;) [10:21] hi all [10:22] i'm wondering what "qsubprocess --bencode ..." exactly does [10:23] vila, the log only seems to contain "Conflicts during merge: Text conflict in doc/en/release-notes/bzr-2.5.txt" [10:23] gnuoy: right, that confirms we failed :) === r0bby is now known as robbyoconnor [10:24] gnuoy: how about the .bzr.log file on the host (not the chroot) ? [10:25] vila, nothing in the past hour [10:25] O_O [10:26] gnuoy: can you paste some of it ? [10:27] vila, https://pastebin.canonical.com/57870/ [10:27] gnuoy: otherwise we have to revise some belief, so may be the merge occurs *in* the chroot ?? [10:29] vila, I'm not sure how to determine that [10:29] gnuoy: bzr version 2.1.4 !!! [10:29] vila, the date is old [10:29] gnuoy: well, the .bzr.log in the chroot will give plenty of hints about what is done there [10:30] gnuoy: or did you mean you don't know where to find this log file ? [10:30] vila, I assume its /srv/pqm.bazaar-vcs.org/chroot/home/pqm/.bzr.log [10:31] sounds good [10:32] vila, https://pastebin.canonical.com/57871/ [10:33] ok, so only selftest runs there [10:34] but your previous log paste is not good, it says 2011-10-10 [10:34] yes, I saw that [10:34] gnuoy: may be you looked in the old pqm host ? [10:35] nope [10:36] gnuoy: I'm lost, but there should be a .bzr.log file containing more recent events [10:43] gnuoy: may be you *could* look in the old pqm host ? ;-) [10:43] gnuoy: (never underestimate silly ideas when all the smart ones fail ;) [10:47] vila, there is a bzr.log for the pqm user on the old host but I don't think its relevant, https://pastebin.canonical.com/57872/ [10:49] gnuoy: you're right, doesn't seem relevant for bzr [10:50] vila, I don't suppose this entry from the pqm logs is any help? https://pastebin.canonical.com/57873/ [10:52] gnuoy: hmm, there is a cwd mentioned there... that I never hear about, but that may indeed be the one we're after ? [10:52] gnuoy: and it mentions bzr... (well, bazaar at least_ [10:52] ) [10:53] gnuoy: so if we can't find the .bzr.log file you may at least try it at the section name and do another test [10:54] gnuoy: switching room again (with a laptop mentioning low battery while being in charge for the last hour :-/) [11:08] Hello there! [11:09] We were just wondering what's the state of the multiple-branches-per-directory feature [11:09] Is that receiving any attention nowadays? [11:10] niemeyer: hi [11:10] jelmer: Yo! [11:10] niemeyer: yes, we've been working on that for 2.5 [11:10] jelmer: Sweet! [11:10] there is an experimental format named 'development-colo' in 2.5 that adds such support [11:10] the plan is to eventually merge that support back into the 2a format (as it'd be backwards compatible) [11:10] jelmer: Is the experimental feature "experimentable" ATM? :-) [11:11] jelmer: Our workflows with Go ATM are a bit ugly and boring to deal with.. this would be quite a neat improvement [11:11] niemeyer: it does work, but the UI isn't completely there yet [11:12] jelmer: What important pieces are missing? [11:12] niemeyer: at the moment you still need to address colocated branches (as they're being named) by their full URL, rather than by short names as in e.g. git or mercurial [11:12] jelmer: If it's workable and won't eat our lunch, we can probably be guinea pigs for it [11:12] jelmer: Ok, but what about local use? [11:12] niemeyer: so "bzr log file:,branch=foo" or "bzr log file:///home/jelmer/src/samba,branch=foo" rather than just "bzr log foo" if you're already in /home/jelmer/src/samba [11:13] jelmer: Ok, I could live with that [11:13] niemeyer: I'm very interested to hear about anything else you run into [11:14] jelmer: How do I get started on it? [11:14] niemeyer: the name we're using for it is co-located branches, the existing known bugs are here: https://bugs.launchpad.net/bzr/+bugs?field.tag=colocated [11:14] niemeyer: upgrade to development-colo ('bzr upgrade --development-colo') [11:15] niemeyer: you'd probably want to use the bzr daily builds if you do this, I think a fair number of fixes was made after beta 4 [11:15] jelmer: Sounds good [11:15] niemeyer: "bzr branches" will list the existing branches [11:16] jelmer: Ah, I've seen that one elsewhere ;).. sweet [11:17] jelmer: and to create / checkout new branches onto the existing tree? [11:17] jelmer: If there's documentation elsewhere, I'd be happy to read rather than pestering you :) [11:19] For those following at home, you'll want this: sudo add-apt-repository ppa:bzr/daily [11:20] niemeyer: I haven't gotten around to writing that yet unfortunately, mostly because there are still a few rough edges in the UI to fix up [11:20] (you have been warned) [11:20] jelmer: :-) [11:21] niemeyer: creating a new branch should be "bzr init file:,branch=bla" to create a branch named "bla" [11:21] (eventually that'll be just "bzr init bla") [11:28] jelmer: Just so I understand the underlying model, why the file: prefix? [11:31] niemeyer: mostly because of our internals [11:31] niemeyer: we do want to support plain colocated branch names [11:32] jelmer: Yeah, I guessed that.. was just wondering what file: would cause to the internals so I can infer when to use it [11:32] niemeyer: we use a , for path segment parameters, but that only works for URLs at the moment, not for local file paths [11:33] jelmer: Aha, gotcha, thanks [11:34] (we didn't want to break people who had branches with comma's in their path) [11:37] jelmer: sensible [11:37] jelmer: [11:38] [niemeyer@gopher ~/a]% bzr branches [11:38] * (default) [11:38] foo [11:38] jelmer: How to reference to that "default" branch [11:38] jelmer: Just trying to understand how to get started with a directory containing branches [11:38] niemeyer: with no branch argument you'll get the default branch [11:39] jelmer: Hmm.. doesn't seem to work in this case.. [11:42] Hmm.. it's not clear how to check an existing branch out either [11:42] If I use "bzr checkout file:,branch=foo", I get a real directory called ",branch=foo" in the current path [11:44] jelmer: ^ [11:46] niemeyer: sorry, at the platform rally atm.. was distracted for a bit [11:46] jelmer: Maybe we should talk live.. :-) [11:46] niemeyer: ah, cool - didn't realize you were here too [11:46] jelmer: :) [11:46] niemeyer: yeah, that might be easier [11:46] jelmer: The above history is good, though.. I plan to share it [11:51] jelmer: Yeah, I don't know how to switch a branch I'm afraid [11:58] niemeyer: the setup is a bit tricky at the moment, I'll have a look at it later today and get back to you if that's okay [12:59] is there a recent manual on how to create a bzr install for windows? === Quintasan_ is now known as Quintasan [20:17] lifeless: not so as you can tell, but ok === yofel_ is now known as yofel === wallyworld is now known as uncleian === wallyworld__ is now known as uncle_ian