| === r0bby is now known as robbyoconnor | ||
| === poolie_ changed the topic of #bzr to: Bazaar version control <http://bazaar.canonical.com> | try https://answers.launchpad.net/bzr for more help | http://irclogs.ubuntu.com/ | Patch pilot: jelmer | ||
| poolie_ | i'm going to finish a coupel of the pending ones though | 00:42 |
|---|---|---|
| lifeless | poolie_: btw, the subtree detection stuff would mean that adding files in a subtree will require changes to status to support it. | 00:50 |
| poolie_ | true | 00:52 |
| lifeless | (no opinion on desirability, just flagging the impact) | 00:52 |
| poolie_ | i'm not going to do it now | 00:52 |
| poolie_ | it will need some careful testing | 00:53 |
| poolie_ | today after piloting some stalled bzr things i hope to work on the incoming mail feature flag for dkim configuration | 00:53 |
| lifeless | cool | 00:53 |
| spiv | Good morning folks | 01:24 |
| poolie_ | hi spiv | 01:29 |
| bradm | poolie_: removing the hardy chroot on pqm slipped until today, removing it now unless I hear screaming otherwise. :) | 01:32 |
| * poolie_ does not scream | 01:32 | |
| poolie_ | oh for interest, i submitted back-to-back merges the other day and the run time was pretty stable at 40m | 01:33 |
| evanton | I have a bzr repo retrieved by "bzr branch" command. How to I change the working directory to a certain revision? Doing bzr checkout -r x yields a file exists error for .bzr | 04:16 |
| poolie__ | evanton: 'bzr update -r whatever' | 04:16 |
| evanton | oh, it's update in bzr | 04:16 |
| evanton | poolie__: thanks, I'll read the help for update now | 04:16 |
| poolie__ | checkout makes a new checkout | 04:17 |
| poolie__ | update updates an existing working tree from the repositoyr | 04:17 |
| evanton | poolie__: I'm just used to switch revisions using checkout in another DVCS | 04:17 |
| === poolie__ is now known as poolie | ||
| poolie | i'm going to look at https://bugs.launchpad.net/bzr/+bug/764188 | 04:29 |
| ubot5 | Ubuntu bug 764188 in Bazaar "test_report_bug_legacy fails on trunk" [Critical,Confirmed] | 04:29 |
| poolie | hopefully shallow | 04:29 |
| poolie | ok | 04:30 |
| poolie | doctestmatchers really do kind of suck | 04:31 |
| poolie | i think it was broken by wordwrapping | 04:31 |
| spiv | Wow, that's a difficult error to parse | 04:32 |
| poolie | that's another bad thing about it | 04:35 |
| poolie | launchpad wrapping it again is not helping | 04:35 |
| poolie | how are you? | 04:36 |
| spiv | Pretty good. I've got a touch of the cold V had, but so far only a touch of it. | 04:40 |
| spiv | I've got to the point of having some failing tests for the pack concurrent writes | 04:40 |
| poolie | oh, nice | 04:41 |
| spiv | Oh, and http://twistedmatrix.com/trac/ticket/5011 has gone through another round of review and improvements. | 04:41 |
| poolie | hopefully clean non-thread-based tests? | 04:41 |
| spiv | Yes :) | 04:41 |
| poolie | review pls? https://code.launchpad.net/~mbp/bzr/754188-apport-test/+merge/58064 | 04:51 |
| spiv | Reviewed (and approved) | 04:59 |
| poolie | almost needs a tag +should-have-known-better | 04:59 |
| === 16WAAA4BV is now known as wallyworld1 | ||
| poolie | spiv i thought there was a function to raise knownfailure when a particular assertion fails | 06:26 |
| poolie | but i can't find it | 06:26 |
| poolie | oh maybe in testtools | 06:26 |
| poolie | yes it is | 06:26 |
| poolie | hm so bellany running make check is about twice as slow as a buildd building the whole binary package (including make check and other stuff) | 09:35 |
| poolie | maxb: i added some stuff to http://wiki.bazaar.canonical.com/DailyPpaStatus#preview and i think fixed the trunk builds | 09:36 |
| jam | hi poolie | 09:40 |
| jam | poolie: so the buildd is significantly faster than our pqm... interesting | 09:40 |
| jam | so we should be submitting it to buildd first | 09:40 |
| jam | :) | 09:40 |
| poolie | :) | 09:41 |
| poolie | there is a drawback that you may wait quite a while to actually _get_ to build on the buildd | 09:41 |
| poolie | if you include that, it's probably slower | 09:41 |
| poolie | anyhow, it broke a little bit and i think now it's ok again | 09:43 |
| poolie | did you ever touch the rules code? | 09:43 |
| spiv | I've touched it very slightly. | 09:47 |
| poolie | it seems like we need a better api than an iterator of every relevant value | 09:57 |
| poolie | surely you normally just want one? | 09:58 |
| poolie | i think i'll take a detour to do it | 09:58 |
| === nixness is now known as foocraft | ||
| rom1 | Hi all | 10:42 |
| rom1 | Is there a way to ignore tabs and spaces conflicts while merging ? | 10:43 |
| jam | rom1: not that I know of. Though if there were conflicts, what would you put in the output? | 11:56 |
| rom1 | jam: well, in fact, it is to avoid that it produces conflicts (for instance in java or c programs). I have noticed some reported conflicts with bzr-builder from spaces versus tab. | 11:57 |
| rom1 | But i will have a look at the content-filters i guess | 11:58 |
| jam | rom1: sure, I understand the concern, but what do you actually put since they disagree on what the content would be | 11:58 |
| jam | rom1: using content filters you can help enforce the form stored in the repository. However, merging is done on the repository form, AIUI | 11:58 |
| jam | so existing content won't be helped | 11:58 |
| rom1 | in my idea, i keep lines from OTHER | 11:59 |
| jam | rom1: I know you can create a custom merge function, too | 11:59 |
| rom1 | thx jam, i gonna have a look at that | 12:00 |
| === mrevell is now known as mrevell-lunch | ||
| === mrevell-lunch is now known as mrevell | ||
| === Ursinha-afk is now known as Ursinha | ||
| cheater | hey guys | 14:35 |
| cheater | how can i check out only a specific subdir of a repo? | 14:35 |
| rom1 | cheater : you cannot. You can only checkout the whole repository | 14:37 |
| cheater | hmm | 14:38 |
| rom1 | Revisions are revisions of repository and not revisions of files as in svn or cvs | 14:38 |
| cheater | gotcha | 14:38 |
| fullermd | s/repository/branch/ to be precise. | 14:38 |
| cheater | that's fine with me, i just want the file system to only have just that subdir | 14:38 |
| fullermd | There exist 'views', which are a primitive that could be used toward building such a thing. But nobody's done it. | 14:38 |
| cheater | i wish bzr would keep the whole repository just in .bzr somewhere | 14:38 |
| cheater | fullermd: aha | 14:39 |
| briandealwis | Greetings. Does anybody know of a way to rename a pipeline? | 14:53 |
| jelmer | briandealwis: pipes basically work by setting next_pipe / prev_pipe in branch.conf | 14:54 |
| briandealwis | ah, thanks jelmer — I hadn't started poking | 14:54 |
| jelmer | briandealwis: so if you rename the branch dir and update those settings in the previous and next pipe you /should/ be fine (I haven't tried) | 14:54 |
| briandealwis | jelmer: yup, that seemed to work. Thanks! | 14:56 |
| jelmer | jam: having fun with trees and inventories too ? | 15:41 |
| gypsymauro | hi, how can I tell bzr to exclude some extensions? | 16:52 |
| jelmer | gypsymauro: you can uninstall them or set the BZR_DISABLE_PLUGINS env variable | 16:54 |
| jelmer | gypsymauro: why do you want to disable some plugins? | 16:54 |
| gypsymauro | I mean file extensions for example I qant to forgive .log or .ini files | 16:55 |
| briandealwis | gypsymauro: read up on the .bzrignore file | 17:00 |
| gypsymauro | tanx briandealwis :D | 17:14 |
| === deryck is now known as deryck[lunch] | ||
| === tremolux_ is now known as tremolux | ||
| === deryck[lunch] is now known as deryck | ||
| === beuno is now known as beuno-lunch | ||
| === beuno-lunch is now known as beuno | ||
| === imback is now known as JasonO | ||
| ablmf333 | I'm using bzr to work with svn repository. Today suddenly I found I can not correctly update it by "bzr update" | 22:16 |
| jelmer | ablmf333: can you elaborate? | 22:17 |
| ablmf333 | When I try to commit, I got " bzr: ERROR: Bound branch BzrBranch7(file:///home/peter/Work/repo/cms/) is out of date with master branch SvnBranch('svn+ssh://peter.cai@svn_repo/sites/svn/cms/site/branches/sprints/V000006'). | 22:17 |
| ablmf333 | But when I run "bzr update", I got "Tree is up to date at revision 296 of branch svn+ssh://peter.cai@svn_repo/sites/svn/cms/site/branches/sprints/V000006" | 22:18 |
| ablmf333 | I found similar problem this afternoon, so I removed local repo and re-checked out the code. | 22:19 |
| ablmf333 | But again, I met this problem. | 22:19 |
| ablmf333 | svn works fine. | 22:19 |
| jelmer | ablmf333: what version of bzr-svn are you using? | 22:19 |
| jelmer | ablmf333: what does "bzr missing" report? | 22:19 |
| ablmf333 | bzr missing says "bzr: ERROR: No peer location known or specified." | 22:19 |
| jelmer | ablmf333: and with the master branch specified? | 22:20 |
| ablmf333 | bzr-svn version : svn 1.0.5dev | 22:20 |
| ablmf333 | Support for Subversion branches | 22:20 |
| ablmf333 | bzr missing . | 22:21 |
| ablmf333 | Branches are up to date. | 22:21 |
| jelmer | ablmf333: did you commit any merges recently? | 22:21 |
| ablmf333 | Yeah, I pushed some changes. Then I got found local repo could not correctly update. So I re-checked out. | 22:22 |
| ablmf333 | So my earlier commits messed up the repo on svn? | 22:22 |
| jelmer | ablmf333: you did "bzr push" to push changes, rather than committing to the checkout? | 22:23 |
| jelmer | did any of those involve merges? | 22:23 |
| ablmf333 | Yeah, it used to work fine. | 22:23 |
| ablmf333 | Yeah, I remembered I merged from trunk. | 22:23 |
| ablmf333 | Did some revision on branch. | 22:24 |
| ablmf333 | Push | 22:24 |
| jelmer | that's probably what triggered it. Recent versions of bzr-svn should cope with this better. | 22:24 |
| ablmf333 | Then I found local repo can't update anymore. | 22:24 |
| jelmer | Is there any reason you're using an snapshot rather than a release? | 22:24 |
| ablmf333 | You mean bzr-svn? | 22:24 |
| jelmer | ablmf333: yeah | 22:24 |
| ablmf333 | Can't really remember. | 22:24 |
| ablmf333 | I will try a release version then. | 22:25 |
| jelmer | I don't think a release will work better, the related fixes are only in newer snapshots | 22:25 |
| ablmf333 | jelmer: So should I try a snapshot of bzr-svn? | 22:27 |
| jelmer | ablmf333: you're already running a snapshot, but a fairly outdated one. | 22:27 |
| jelmer | ("dev" in the version string indicates it's a snapshot rather than a release) | 22:28 |
| ablmf333 | k, I will try to find a newer snapshot | 22:28 |
| ablmf333 | jelmer: I checked out bzr-svn by "bzr co lp:bzr-svn" | 22:34 |
| ablmf333 | Is that right? | 22:34 |
| jelmer | ablmf333: yep | 22:35 |
| === Droid is now known as Guest66278 | ||
| ablmf333 | then I coped it to "/home/peter/.bazaar/plugins/" | 22:36 |
| ablmf333 | but "bzr plugins" still tell me it's 1.0.5dev | 22:36 |
| jelmer | it should say 1.1.0dev | 22:41 |
| jelmer | ablmf333: you need to rename it 'svn' rather than 'bzr-svn' | 22:41 |
| ablmf333 | jelmer: thanks. I got it, but new problem: cannot import name CommittedQueue | 22:41 |
| ablmf333 | Unable to load plugin 'svn' from '/home/peter/.bazaar/plugins' | 22:41 |
| jelmer | ablmf333: what version of subvertpy does ~/.bzr.log say you have? | 22:42 |
| ablmf333 | let me check | 22:42 |
| ablmf333 | In [2]: subvertpy.__version__ | 22:44 |
| ablmf333 | Out[2]: (0, 7, 5) | 22:44 |
| jelmer | ablmf333: that's too old; the newer bzr-svn requires subvertpy 0.8.0. It should warn about this, I'll check why it doesn't. | 22:45 |
| ablmf333 | jelmer: 0.8.0 of subvertpy reports "Unable to load subvertpy extensions: No module named client" | 22:51 |
| ablmf333 | jelmer: Oh, I see, that's because I am still in subverpy source code dir | 22:52 |
| jelmer | ablmf333: subvertpy has a C extensions that need to be built | 22:52 |
| ablmf333 | jelmer: opos, svn plugin crashes : http://pastebin.com/TtG9MRyR | 22:55 |
| jelmer | ablmf333: that's because your subvertpy is too old | 22:55 |
| jelmer | hi poolies :) | 22:56 |
| poolie | hi jelmer :) | 22:59 |
| poolie | how are you? | 22:59 |
| poolie | thanks for the review | 22:59 |
| poolie | i'm going to try to finish off sergei's patch today | 22:59 |
| poolie | a full version with tests and docs will be a bit more than 5 lines or whatever it was | 23:00 |
| jelmer | poolie: very well, thanks :) | 23:00 |
| jelmer | poolie: is that his patch related to diff ? | 23:01 |
| === Ursinha is now known as Ursinha-afk | ||
| poolie | yes, to showing the function name | 23:03 |
| === wizonesolutions2 is now known as wizonesolutions | ||
| poolie | you're pp this week btw | 23:08 |
| poolie | i should read vila's patches too... | 23:10 |
| jelmer | poolie: Yep | 23:12 |
| knighthawk | I'm trying to break a lock but I seem to be doing something wrong. when I try to run bzr pull on a svn-import | 23:14 |
| knighthawk | i'm getting | 23:14 |
| jelmer | ablmf333: lp:bzr-svn should now warn properly on older versions of subvertpy | 23:14 |
| ablmf333 | jelmer: Ah, now the problem seems to be bzr is too old | 23:15 |
| jelmer | ablmf333: what error are you getting? | 23:15 |
| knighthawk | Unable to obtain lock file: | 23:16 |
| ablmf333 | http://pastebin.com/C2mK7cBP | 23:16 |
| jelmer | ablmf333: I've pushed a fix, can you try again? | 23:18 |
| ablmf333 | jelmer: k | 23:18 |
| knighthawk | I think I may have figured it out. | 23:19 |
| ablmf333 | jelmer: k, the plugin work. But it doesn't solve my original problem - I can't commit | 23:22 |
| ablmf333 | It asks me to update, but when I update, it says my repo is up to date. | 23:22 |
| knighthawk | I think I'm missing a step when working with a central svn server. | 23:23 |
| sven_oostenbrink | Question.. Whenever I have 2 repos with a shared history, they are synced, and then I modify file "a" in repo "a" and file "b" in repo "b".. Now, when I want to pull repo "a" into "b", I have to perform a merge.. Since different files were modified, it basically could have been like file "a" and file "b" were modified in repo "b".. Isn't it possible to make push/pull like this that merge without problem just possible without having to merge? and only | 23:23 |
| sven_oostenbrink | in case that there is a conflict, that a merge is required? it would shave off some of the needed work... | 23:23 |
| jelmer | ablmf333: do you have any pending merges? | 23:25 |
| fullermd | sven_oostenbrink: No, because you don't merge files; you merge revisions. And you have new revisions in both sides. | 23:25 |
| ablmf333 | jelmer: Yes. | 23:25 |
| jelmer | ablmf333: (the last few lines of "bzr status" should show you) | 23:25 |
| ablmf333 | I have some pending merges | 23:25 |
| ablmf333 | that's why I need to commit | 23:25 |
| jelmer | ablmf333: is your current head the same as the head of the master branch, or is the pending merge the current master branch? | 23:26 |
| knighthawk | So far I've been able to do a svn-import and create a branch. Next I was able to pull from the central svn repo into my local repo (where I don't have a working tree) next I guess I want to my branch with the repo ( my head isn't getting how to do that without a working tree). But where i'm *most* confused with is how do I push back up (assuming I did all my actual work in my branch wich points to the repo) | 23:26 |
| ablmf333 | jelmer: thx, but I will use svn for this now. It already wasted me too much time. | 23:27 |
| jelmer | knighthawk: you can either create a working tree in the branch that was created by "bzr svn-import", or you can create a clone of that branch with a working tree | 23:27 |
| jelmer | knighthawk: you can use "bzr push" to push your changes made in the local branch back to svn | 23:28 |
| knighthawk | jelmer when I ran bzr branch did it create a clone of the branch in the repo or do I need to use a different command to have my pushes go up? | 23:29 |
| jelmer | ablmf333: It'd be great if we can narrow it down a bit so I can fix the bug in bzr-svn | 23:29 |
| jelmer | knighthawk: I'm not sure I follow, what sort of "bzr branch" command did you run? | 23:30 |
| ablmf333 | jelmer: I've delete the repo folder. But I still have another one that couldn't update correctly. | 23:30 |
| ablmf333 | That one when I run update, it says it's up to date. | 23:30 |
| ablmf333 | but it's different from what is on svn | 23:30 |
| ablmf333 | jelmer: What do u want to know? | 23:31 |
| jelmer | ablmf333: so "bzr up" doesn't update to the actual last revision in svn? | 23:31 |
| ablmf333 | yes. | 23:32 |
| jelmer | ablmf333: are there any merges involved? | 23:32 |
| knighthawk | jelmer so after I did the init bzr svn-import (I didn't really want a big working tree in that dir) I ran 'bzr branch ' into another dir. I've been calling that my working tree. I've been doing my work their. Then thought the workflow I needed was to update my "working tree" to what's in the svn repo to go into my local repo(created for svn-import) then run a pull there and merge that with my branch with my working tree | 23:32 |
| ablmf333 | jelmer: The story is : 1) i merged trunk to branch. 2) work on branch 3) push back to trunk. 4) trunk couldn't update anymore. | 23:32 |
| jelmer | knighthawk: you should be able to just run "bzr push <svn-url>" from wherever you've been working | 23:33 |
| knighthawk | ah thanks jelmer | 23:33 |
| ablmf333 | jelmer: That makes me can't not fetch some reversions on server. | 23:33 |
| jelmer | knighthawk: is the trunk you're trying to update a svn working copy or a bzr checkout? | 23:34 |
| knighthawk | I'm going to say a svn working copy. | 23:35 |
| jelmer | knighthawk: sorry, that was for ablmf333 | 23:35 |
| knighthawk | ah | 23:36 |
| jelmer | ablmf333: is the trunk you're trying to update a svn working copy or a bzr checkout? (iow, does it have a .svn or a .bzr dir?) | 23:36 |
| ablmf333 | jelmer: It's a bzr checkout. I used 'bzr co svn_ssh://....." to check out. | 23:36 |
| jelmer | ablmf333: thanks | 23:37 |
| jelmer | ablmf333: what do you mean with push back to trunk exactly? "bzr push svn+ssh://.../trunk" ? | 23:39 |
| ablmf333 | jelmer: No, I created a branch by `bzr branch trunk_dir branch_dir` | 23:39 |
| jelmer | ablmf333: you mentioned you push the work you did on the branch back to trunk; what did you do to do that exactly ? | 23:40 |
| ablmf333 | in 'branch_dir' I run 'bzr push :parent' | 23:41 |
| ablmf333 | Apparently, those changes I made on branch is committed to svn. | 23:41 |
| ablmf333 | But the problem is, after that, the trunk is not able to synchronize to svn server anymore. | 23:42 |
| jelmer | ablmf333: thanks, I think I've narrowed it down | 23:43 |
| jelmer | ablmf333: so "bzr log" doesn't show the revision that was pushed? | 23:45 |
| knighthawk | Is this a fix everyone is going to need? (he asks just before pushing to his svn trunk) | 23:45 |
| jelmer | knighthawk: which fix? | 23:45 |
| knighthawk | what's going on with ablmf333, when you said you' narrowed it down it sounded like you were fixing something. but I see now that may not have been how you meant it. | 23:46 |
| jelmer | ablmf333: sorry, "bzr log" in the trunk doesn't show the revision that was pushed? | 23:46 |
| jelmer | knighthawk: no, that's related to "bzr push" to a branch bound to a svn branch | 23:46 |
| jelmer | knighthawk: you're not using bound branches at all | 23:47 |
| knighthawk | k thanks | 23:47 |
| ablmf333 | jelmer: bzr log show the are pushed. But one single file is different to svn sever, even if bzr tells me the working copy has not changed. | 23:47 |
| jelmer | ablmf333: different as in not yet updated? | 23:48 |
| ablmf333 | jelmer: Yeah. I can't update that file to its newest version. | 23:49 |
| ablmf333 | I can not see one svn reversion someone else made. | 23:49 |
| jelmer | ablmf333: revisions that have happened on the svn trunk since the push of your revisions ? | 23:50 |
| ablmf333 | jelmer: I can't really tell because I've removed the bzr repo. | 23:50 |
| ablmf333 | jelmer: but let me check. | 23:51 |
| ablmf333 | jelmer: maybe I can find it by svn | 23:51 |
| ablmf333 | jelmer: It's a reversion before I pushed. | 23:54 |
| ablmf333 | I should have merged it to my bzr branch this morning. | 23:54 |
| ablmf333 | But somehow it was lost. | 23:54 |
| ablmf333 | And I can never get it back anymore | 23:55 |
| jelmer | ablmf333: thanks, that helps | 23:55 |
| jelmer | ablmf333: I think I've also reproduced the commit issue | 23:55 |
| ablmf333 | jelmer: Great, at least my bad luck might help someone else. | 23:56 |
| ablmf333 | jelmer: Is there anyway to avoid this problem? | 23:56 |
| ablmf333 | jelmer: Should I avoid using push on svn? | 23:56 |
| jelmer | ablmf333: the commit issue is something I'm looking at fixing now | 23:57 |
| sven_oostenbrink | fullermd: I know I merge revisions, not files.. But wouldn't it be nice if.. bzr could recognize that the revisions could be merged without problem? And then just pull, merge automatically, and commit... just with bzr pull? | 23:57 |
| jelmer | ablmf333: the second one is already fixed (between 1.0.5dev and 1.1.0dev) and can be avoided by fetching into a clean bzr repository from svn | 23:57 |
| ablmf333 | jelmer: k, I will try it tomorrow and let u know the result. | 23:58 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!