[00:02] The ideal thing to do here would be for Brian Aker to uncommit the last two merges, and redo them not merging the backout [00:03] hm [00:13] maxb: your solution may have, if nothing else, produced the correct diff. ;) [00:30] Actually the other option which might have been quite neat is: [00:30] Branch the tokyo branch just before the merge + backout [00:31] Merge time-order into that [00:31] Merge the result into trunk [00:34] maxb: wouldn't that still result in those changes not going into trunk? [00:35] I think the key thing is that you would have recommited the delta in the new merge revision, which wouldn't be in the current trunk [00:39] hmm [00:39] It doesn't do what I thought it would [00:40] Flat out.. the message here is.. do not commit from a revert w/o --forget-merges ... :-P [00:41] So incidentally [00:41] http://doc.bazaar.canonical.com/latest/en/user-guide/undoing_mistakes.html#reverting-to-the-state-of-an-earlier-version [00:41] Did it based on this ... [00:41] --forget-merges would not have helped you [00:41] no? so the moral of the story is, use uncommit [00:43] uncommit would have been more appropriate in this use case, yes [00:43] i think in reading it.. [00:43] I didn't want to believe that it would be that easy. ;) [00:43] so used to perforce.. :-P [00:43] if I do something like 'branch --bind http://subversion/repository svnbranch' in a --no-trees shared repository, and then 'checkout --lightweight svnbranch lwco', what should happen to the subversion repository when I commit in lwco? [00:44] I think I generalized my paths a little more than I meant to, but...eh. Does the question even make sense? [00:45] I would suggest that committing to a bound branch ought to commit the changes to the upstream svn repo [00:46] I hope you're right. [00:47] Of course, unfortunately, the repos for which it would be the most helpful if that works the way I want it to, it doesn't matter because there's a revision bzr can't look at without running out of memory. [01:00] actually I think I saw someone in here say that that will give you an error. [01:00] you can't commit to a branch that's bound to a bound branch. [01:00] IIRC. [01:00] But it's a lightweight checkout. [01:01] and? It's still a checkout (bound branch) [01:01] oh. [01:01] Hrmm. Yeah, I think it still applies. [01:01] I dunno, I'm only guessing. [01:01] try it! :p [01:02] Yeah, that's pretty much what I'm gonna have to do [01:02] possibly tomorrow [01:03] ...assuming that I actually have commit access to any of the subversion repos that don't have revisions that choke bzr [01:06] SpamapS: Uncommit would have worked if you only had local history. [01:06] but once it's out in the wild, you can't uncommit it from other people's repositories. [01:06] so you just have to create a new revision with the same content. [01:06] Yeah we were working pretty fast.. ;) [01:13] SpamapS: so did you get it resolved? [01:15] GAAAAAAAAAHHHHHHHHHHHHHHHHHHHH [01:16] $ bzr branch bzr+ssh://bazaar.launchpad.net/~drizzle-developers/pkg-drizzle/trunk /home/hudson/hudson/workspace/drizzle-build-debian-packaging [01:16] Branched 29 revision(s). [01:16] except: [01:16] on a different machine: [01:16] $ bzr pull bzr+ssh://bazaar.launchpad.net/~drizzle-developers/pkg-drizzle/trunk [01:16] Now on revision 37. [01:16] why the crap am I seeing different versions of the branch over ssh ? [01:17] does that machine have 8 local revisions? [01:17] NfNitLoop: the top one is doing a clean branch ... and is also getting an older version of the branch [01:18] oh. Yeah, that's not good. [01:19] wow. if I do it on the top machine _from a different account_ I get the right number of revs [01:19] sounds like there's some load-balancing going on and maybe one of them got a stale version of the branch. [01:20] it would be so great if there were a location I could pull from on my build servers after I've pushed to launchpad that would get the version I just pushed... [01:22] host your own? :p [01:22] yeah... [01:31] mtaylor: https://code.launchpad.net/~drizzle-developers/pkg-drizzle/trunk <-- there's an error there [01:31] mtaylor: Is one of your LP accounts in ~drizzle-developers? [01:32] mtaylor: Oh, the stacked-on branch is owned by you? [01:32] mtaylor: Launchpad keeps two copies of branches, one for people who can write to it, and one for people who can't. Maybe only one of them is busted. [01:33] Or...maybe it's something completely different! :D [01:33] maxb, Peng: yeah ... also, thumper is looking in #launchpad [01:33] Ah. :D [03:03] hi all [05:18] * igc dentist - bbl [05:35] moinish [07:34] Hi igc. [07:35] hi Garyvdm [07:36] Do you want to review changes for be, or should I just push? [07:37] igc: ^ fix for bug 513138 [07:37] Launchpad bug 513138 in bzr-explorer "Versioned filter still shows non-versioned files" [Medium,Confirmed] https://launchpad.net/bugs/513138 [07:37] garyvdm: just push is fine [07:38] you know the qbrowse widget better than I :-) [07:38] Ok - cool. [07:40] igc: done. I think you are going to have a smack your forehead moment when you see the fix :-) [07:43] thanks garyvdm: consider forehead suitably smacked :-) [07:43] on the first bit at least ... [07:43] on the second bit, what's the reason for it? [07:43] garyvdm: ^ [07:44] switching pages perhaps? [07:45] igc: The default in qbrowse is to show versioned and non versioned, but not ignored. [07:46] igc: So in be, we need to set it to whatever the combo defaults to [07:46] because it is different to the qbrowse default. [07:47] ah - ok [07:47] ok - bye [08:23] * igc dinner [08:24] morning igc === jam1 is now known as jam [08:26] hi jam [08:28] File "./check-hottest.py", line 143, in main [08:28] output_stream = ui.ui_factory.make_output_stream(encoding_type='exact') [08:28] AttributeError: 'TextUIFactory' object has no attribute 'make_output_stream' [08:29] jam: ^^^ [08:29] any ideas? [08:31] I think that's been fixed. [08:32] bzrlib.ui.text.TextUIFactory.make_output_stream certainly exists for me. [08:33] * Peng shrugs [08:34] Looks like a new feature, lp:bzr r4880 (2009-12-09)/. [08:46] igc: run with 2.1 [08:57] igc: right, make_output_stream is a 2.1-ism, probably your system bzrlib is 2.0 [09:18] jam: it is. I have 2.2 on my path but that doesn't seem enough ... [09:19] igc: in PYTHONPATH ? [09:19] no, just PATH [09:20] igc: right, it has to be in PYTHONPATH or we won't use that bzrlib [09:20] igc: PATH doesn't a ffect loading of python modul,es [09:20] export PYTHONPATH=/home/igc/dev/bzr/bzr.dev [09:22] jam, lifeless: better now thanks [09:56] t [09:57] Hello everyone. I'm new to bazaar. Can anyone help me to learn the basics of bzr... [10:18] * jam looks around to see who the current LOSA is [10:18] o/ [10:28] hey mthaddon, I had to bump a tag, and need to get that value propagated through pqm [10:28] it requires running some "bzr pull --overwrite" on a couple of branches [10:32] on the pqm machine, going to the 2.1 branch and running: bzr pull --overwrite http://bazaar.launchpad.net/~jameinel/bzr/2.1.0rc1-dev [10:33] and then pulling that into the branch on launchpad itself [10:33] which may just be "bzr push --overwrite lp:bzr" from that same directory [10:50] igc: yo? [10:50] lifeless: hi [10:50] want to skype up? [10:51] or happy as you are ? :) [10:51] lifeless: absolutely [10:51] igc: vila will be a few minutes [10:51] lifeless: ready on my end [11:36] vila: my flighttomorrow is at 07:40 CET [11:36] vila: how long will a cab to the airport take ? [11:44] lifeless: bug #513225 [11:44] Launchpad bug 513225 in launchpad-registry "upstreamreport missing branch icon for vlc" [Undecided,Incomplete] https://launchpad.net/bugs/513225 === mrevell is now known as mrevell-lunch === mrevell-lunch is now known as mrevell [13:30] I've created a project in launchpad and have bzr installed on my system. The project folder with source code is in my /home/Public folder. What is the next step to initiate the trunk? [13:36] napster: The quick answer? bzr init; bzr add; bzr commit -m "Initial revision." At some point you should plan on reading the docs to learn how a shared repository can make branching easier [13:36] s/easier/faster/ [13:37] maxb, I don't get :( I'm really new to bazaar. Can you explain a bit? [13:38] What in particular would you like more detail on? [13:38] maxb, I've just created a project in launchpad. I think there should be some url in the init commands, Am I right? [13:39] napster: You need to create your branch locally. Then you can push it to Launchpad, bzr lp-login (if necessary) and "bzr push lp:~whatever" [13:40] ok, now it seems ok... [13:40] napster: when you created a project on LP you made a place for your local repo to go, you need to create your project localy first and then do a bzr push lp:~directory/to/project [13:41] this will "push" your repo up do LP, that will start the repo right on LP [13:41] rubbs, Then I'll get a remote repo right? [13:42] no, DCVS's have remote and local repos, you do all your work on your local repo, and when you "push" you more or less overwrite the remote repo (although that's not a good word, maybe update is better) [13:42] the idea is to never be directly connected to a remote repo unless you are updating. [13:43] that way you can do work away from a network and at the same time as someone else. [13:43] napster: http://betterexplained.com/articles/intro-to-distributed-version-control-illustrated/ [13:43] it talks about mercurial, but the concepts are very similar to bzr [13:44] that's the article that helped me understand how bzr, git, and mercurial works. [13:44] rubbs, tnx mate :) [13:44] np [14:18] Path(s) are not versioned: I see this error when I've added some files and dir to my already inited,added project directory [14:18] How to fix this? [14:19] do you just want everything in your repo to be added? [14:20] if so you can just run bzr add in the root of your repo, it will add everything in for you [14:21] napster: this is another decent tutorial to help more specifically with bzr: http://doc.bazaar.canonical.com/bzr.2.0/en/tutorials/tutorial.html [14:21] http://doc.bazaar.canonical.com/en/ <- this can usually help you out too. [14:21] and as always, if you have questions, we are more than willing to help here too :D [14:23] rubbs, Actually how to add a directory to my project dir? [14:25] so you have a directory already there and you want it tracked? or you want to add a directory that isn't there yet? [14:26] rubbs, second one... [14:27] ah, that's a little easier. while you are in the project dir, do this "bzr mkdir ./dirname" [14:28] rubbs, But i've created one using "mkdir /nc/img" and then moved some files to it...! [14:29] I love 2a over nosmart+http. Of course you need to make a dozen 64k requests to figure out you have nothing to pull! [14:29] [14:30] napster: oh. so you have the new dir img and you want bzr to add it to the project [14:31] rubbs, yes [14:31] is there any files/directories in your project you *don't* want added? [14:31] rubbs, the file inside /img too [14:31] rubbs, Nothin "not to be added" [14:32] ok, easiest is to just be in your project and do "bzr add" that will automatically recurse and add every file that isn't already added. [14:32] also, you can say "bzr help add" to see what kinds of things add can do [14:33] rubbs, done, but error exists... [14:34] hmm. that's strange. you get the "Path(s) not versioned?" what version of bzr are you running (first line of output from "bzr version") [14:35] rubbs, Bazaar (bzr) 2.0.2 [14:37] napster. have you commited since you ran bzr init? [14:38] rubbs, that means run bzr commint? [14:38] rubbs, that means run bzr commit? [14:38] yes [14:39] the error shown up when i try to commit [14:39] bzr commit "Added some icons" [14:39] Committing to: /home/napster/Public/netchat/ [14:39] aborting commit write group: PathsNotVersionedError(Path(s) are not versioned: "Added some icons") [14:39] bzr: ERROR: Path(s) are not versioned: "Added some icons" [14:39] ^^ pls take a look [14:40] oh... bzr needs the -m flag when commiting. Try this "bzr commit -m 'Added some icons'" [14:40] rubbs, ohhh... I'm really sorry... [14:40] no problem. it's all about learning [14:41] rubbs, :) [14:41] best way to learn is to make mistakes [14:41] ;) [14:41] Unless your mistake is so bad that you die. Then other people learn, but it's not so good for you. [14:42] rubbs, ;) [14:42] Peng: ha... I suppose, I'll add that caveat next time I say that. === salgado is now known as salgado-lunch [14:50] napster: did that help? === khmarbaise_ is now known as khmarbaise [15:19] hey sprinters [15:19] any of you know where bzr-builder gets the sourcepackage name from? [15:20] rubbs, Absolutly [15:21] napster: great! [15:21] rubbs, I didn't say thanks because I need your help again.... :) [15:21] haha, no problem, what's up? [15:26] jml: the changelog [15:26] lifeless, thanks. [15:27] de nada [15:32] rubbs, I'm really new to all such things. I need a software which should be maintained as a opensource project. [15:32] rubbs, :) [15:35] are you atempting to make your own from scratch, or are you trying to contribute to an open source project that has already been started? [15:47] rubbs, Pls add my nick when you talk :) ... I'm trying to create on from scratch. I searched in launchpad, but can see similar projects in java === salgado-lunch is now known as salgado [15:53] napster: sorry forgot to add your name earlier. Have you read the launchpad help docs? They are pretty helpful on how to launch and maintain a project. [15:54] rubbs, I'm on the help/tutorial pages for a while :)... [15:55] rubbs, Is it harder to post a project on lp, if I've already a bzr branch on my local system? [15:56] No? [15:56] Wait, what are we talking about? [15:57] Peng, About hosting a new project [15:58] napster: the way to post your project is to set up the project and then do "bzr push lp:~/username/projectname/branchname" [15:58] ~username [15:58] er... should be ~username not ~/username [15:58] thanks lifeless [15:59] rubbs, and the branchname? [15:59] rubbs, may be main? [16:00] Well, you could name it lp:~username/projectname/rubbs_is_awesome if you wanted to, but something like "main" or "trunk" is common. [16:00] Peng, Thats nice :) [16:02] Peng napster naming something rubbs_is_awesome is most definately not recommended ;), mostly because it wouldn't be true. [16:02] rubbs, lol [16:02] Since when have software products had accurate names? :D [16:04] Peng: good point [16:42] I've tried to push my local branch to lp, but seems happened nothing...! What to do?? [16:43] napster: What makes you think nothing happened? [16:43] napster: Pastebin the command you ran and its output. [16:45] Peng, http://pastebin.com/m76cdcacd [16:45] Peng, I can't see a branch named main in the launchpad site :( [16:46] napster: It exists: https://code.launchpad.net/~subinsebastien-gmail/netchat/main [16:47] Peng, Why its not trunk? [16:47] napster: What do you mean? [16:47] Its not the trunk branch right? [16:47] napster: If you want it to be set as the development focus branch or something, that's a separate step on LP's website. [16:48] Peng, yes, how? [16:48] No idea! Should be pretty obvious. [16:49] ok. using windows bazaar [16:49] im a idiot, btw [16:49] im getting this message you have a valid .bzr control directory, but not a branch or repository. This is an unsupported configuration. Please move the target directory out of the way and try again [16:49] what do i do? [16:51] Peng, I've set it. If we have only one branch, a search would return it and suggest to set as development focus branch [16:53] mtaylor: pandora .98 in testing [16:54] Why there should be a number of branches? What is the purposes? [17:11] What's the status of nested tree support in bzr? I mean something similar to svn's externals. [17:13] I'd even be happy with something analogous to the Chromium project's depot tools (which support svn and git). [17:21] rubbs, Peng lifeless Thanks a lot for you help. I think I'm covering the first learning curve and will continue... tnx once agin... :) see you later.... [17:22] napster: goog luck. glad to have helped [17:22] rubbs, see you.. [17:23] chrisboom: are you using bzr via the windows commandline? [17:23] Hi. I have project tree, and I want to split a chunk of it out into a new, related project ... [17:23] nope [17:23] im using bazaar explorer [17:24] think we need a good tutorial out there for using explorer to simply log in to a launchpad id, set up ssh and start going [17:24] Logically it's a sub-tree, in that the first project will depend it, but it can't reside in a directory below the first project because of restrictions of the dev env. [17:25] My questions are, what is the status of Nested Trees, and is there a way to move the files into a new project but keep their history from the first project? [17:25] chrisboom: did you do anything to the .bzr folder or name anything .bzr? [17:26] how do i set up ssh on windows? [17:27] VSpike: I'm not entirely sure of the status of Nested trees, but you could look here: http://wiki.bazaar.canonical.com/NestedTreesDesign that might help [17:27] chrisboom: do you have putty installed? [17:27] nope [17:27] I already have main/lib and main/web, for example.. with main/lib being a component sub-project of main/web .. but I just handle the relationship manually [17:27] chrisboom: http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html click on the installer [17:27] ok, downloading that [17:28] now what? [17:28] chrisboom: it should install putty, and pagent. [17:28] chrisboom: you need to run puttygen [17:28] cool [17:28] puttygen will create an ssh key for you [17:29] which i enter into launchpad? [17:29] chrisboom: yes [17:29] chrisboom: https://help.launchpad.net/YourAccount/CreatingAnSSHKeyPair [17:30] ok, added the public key [17:30] chrisboom: ok, then open your key with pagent [17:30] pagent will have a small icon in the systray [17:30] I'm just starting to use bzr (and version control in general) for a project which has many dependencies on open-source packages, some of which I've modified for this project and many of which I haven't. It seems that importing the source trees for these packages into the project's main repository is a suboptimal solution, even though some other projects (e.g. Mozilla) do that. [17:30] If I were using svn, I'd use externals, at least for the third-party packages that have svn repositories. [17:30] chrisboom: when pagent has the ssh key loaded, you can use bzr with ssh. [17:31] kl [17:32] it worked! [17:32] MattCampbell: there are lots of requests for externals, but IIRC there is no support for externals in bzr. [17:32] chrisboom: awesome [17:32] MattCampbell: I could be wrong. [17:33] Any suggestions in the meantime? [17:35] MattCampbell: see the NestedTrees link above - it's supposed to be bzr's answer to externals, I believe [17:35] MattCampbell: I'm not sure, but i think that the nested trees is supposed to help (I know they are getting closer to full support). [17:35] Just trying to ascertain the status, because AFAICT that is a design document, and doesn't explain status [17:36] MattCampbell: VSpike IIRC bzr explorer (the beta version) has some rudimentary way of doing it. [17:36] I'm not sure though [17:36] So that's only in the GUI tool right now? [17:37] I've gtg to lunch, but keep asking questions, someone here is bound to help you ;) [17:37] MattCampbell: I think so, but I'm unsure. This is really not my area of expertise [17:47] OK, I see two tools that implement something like nested trees, config-manager and bzr-scmproj. It seems that bzr-scmproj is more actively developed. So does anyone here know of any advantages of config-manager? [17:54] Hi. I'm still trying to convert my svn repository to bzr branches. However the svn repository layout is not a classical one and I think it can't be done with either svn2bzr.py or fast-export-from-svn [17:55] pynonoir: I'd expect bzr-svn (the foreign branch support) to be your best choice at this time [17:55] So first I would like to be sure that it can't be done [17:56] pynonoir: but I haven't looked into this recently, so an even better choice may be available [17:56] oh wait, *not* a classical one [17:56] * mzz cannot read [17:56] no pb [17:56] hmm, at some point the repository layout was pluggable [17:56] I don't know if that went anywhere though. [17:56] I'd stick around in here and wait for someone to show up who knows about that [17:57] The last time I tried bzr-svn was not able to import the repo [17:58] Then I had other ideas. One of them would be to use mercurial as an intermediate [17:59] But I'm not sure it would work better, at least the hg-->bzr part [18:01] I'm also looking for some informations about bzr internals, at least to know if there is in theroy a working solution for me [18:02] for example, how does bzr knows that two bzr branches share a common history before doing a merge [18:03] bzr revisions all have an internal (globally unique) id. They also know the id (or ids) of their parent. [18:04] bzr-svn works by constructing fixed bzr revision ids for a given svn repository url and revision number, basically. [18:04] so if you convert the same svn repo more than once using bzr-svn you get the same revision ids, so bzr knows they're actually the same branch [18:04] when I looked into bzr-svn in the past you could modify the repository layout it assumed, but I don't know if it still supports that [18:05] then would it be possible to convert each branch of a svn repo, one after another ? [18:05] (doing that would affect the revision ids it generates) [18:05] you don't normally want that, because you'd lose the relation between the revisions (those parent ids I mentioned) [18:05] err, relation between the *branches* [18:05] that's what I was afraid of [18:06] I suspect bzr-svn can be hacked up to do this, but I don't know how hard that would be, or if there is an easier solution. [18:07] ok, I note bzr-svn in my todo list :) [18:09] mzz: so you think that the relations between branches must be analyzed at once, while creating a new bzr shared repository for all imported branches ? [18:10] pynonoir: bzr-svn can handle this (for multiple repository layouts, last time I checked, although possibly not for yours) [18:10] Ok, I'm going to check right now. Thanks :) [18:11] it can do branches separately, but if the layout assumptions it makes change you want the generated ids to change too, or you get insane conflicting branches [18:20] hey [18:25] hey [18:28] hey [18:28] hey [18:29] anything new for bug #113809? [18:29] Launchpad bug 113809 in bzr "update performs two merges" [High,Confirmed] https://launchpad.net/bugs/113809 [18:29] I'm beginning to think the whole update command is in need of a redesign/rewrite [18:30] it sometimes changes the repo I'm updating from [18:30] also, the fact that "bzr update; bzr revert" loses all local changes is REALLY counterintuitive [18:30] it should go back to the situation before the update in my opinion [18:31] also, "bzr pull" on a bound branch should not pull from the saved location but from the location of the bound branch === jml is now known as joneaux === joneaux is now known as jml [18:48] gerard_: yikes! How would it change the repo you're updating from? [18:49] gerard_: "bzr revert" is defined as reverting your working tree... I don't find it very counterintuitive. It's the same as in SVN and other SCMs. [18:50] so what command should I use if I mess up fixing a conflict after update? [18:50] it's really scary to have no backup [18:50] *nod* That's one of the weak points of that workflow. [18:51] If you do development in a standalone branch, you can commit first. Then merge. [18:51] and if your merge goes poorly, you can revert to your last commit. [18:51] The latter workflow is how distributed development goes. The prior is just allowing the same workflow that people are used to in SVN. [18:52] (You have the same problem in SVN.) [18:52] you say I can "revert to your last commit" [18:52] don't think so [18:52] the revert will make my branch a copy of the one I updated from [18:53] I'm using the centralized with local commits [18:53] workflow [18:53] though I'm beginning to wonder if anyone else does [18:53] I do. [18:53] because some things are buggy as hell [18:53] if you have some local commits and local changes update will mess up severely [18:54] Oh, hrmm. [18:54] Yeah, I try to avoid that case. What does it do? [18:54] I would assume it tells you that you've diverged from the parent branch? [18:55] no, you get conflicts with your own work [18:55] it's really confusing [18:55] that's the bug #113809 I mentioned [18:55] Launchpad bug 113809 in bzr "update performs two merges" [High,Confirmed] https://launchpad.net/bugs/113809 [18:55] it will do two merges, and if the first one is a conflict it will then finds conflicts in the conflicts [18:56] you end up with files like file.moved.moved [18:56] trying to fix that case now [18:56] it's going ok but one of the testcases doesn't want to cooperate [18:56] the first merge it is supposed to do doesnt work in that case or something [18:56] I'm beginning to expect a bug in the merge code [19:01] by "it will do two merges" do you mean "it will do a merge for each locally-committed revision"? [19:01] Because that's what I would expect. [19:01] NfNitLoop: it will merge your local changes into the master and merge that into your local commits [19:02] if your local changes conflict with the master, the conflicts will conflict with your local commits [19:02] I'm trying to swap the order of merges around [19:03] so it should first merge your local changes with your local commits (the simplest merge possible) and then merge that into the master [19:03] the reason for the first merge is that instead of "local commits" you should be able to read "the commits on the branch this lightweight is bound to" [19:05] Hi, i need export a revision with python lib bzrlib [19:05] but i need have a repo Tree [19:06] i import from bzrlib import tree [19:06] but i dont know how create a Tree object [19:07] hersonls: is that the ultimate problem you want to solve? [19:07] someone know? [19:07] maybe you can tell us what you want to achieve in the end? [19:07] ok [19:08] i want export a revision like "bzr export . /tmp/project" with python [19:09] ah [19:13] tanks, i found! [19:13] from bzrlib.workingtree import WorkingTree; w = WorkingTree.open('.'); [19:14] :) [19:14] ah, good job :) [19:15] you could try looking in the tests/blackbox dir of bzr [19:15] for lots of small tests/examples [19:21] its work! :) [19:21] from bzrlib.export import export; export(w, '/tmp/test'); [19:21] great! [19:21] hehe [19:22] yeah, I like bzrlib, really easy to use [19:29] I've read about vendor branches in cvs and svn, a way to version-control an upstream package that has no public version control, and more importantly, one's modifications to that package. Is there a similar best practice for bzr? [19:30] There are even scripts to help maintain such branches for other VCSes, e.g. John Goerzen's vcs-load-dirs scripts, which support hg and git but not bzr. [19:31] MattCampbell: have a "clean" branch with the upstream code and a private one? [19:31] and them merge from the clean one into the private? [19:32] Right. Now when a new upstream version comes out, how do I update the clean branch from the upstream archive? [19:33] just untar the new version over the old one and then commit [19:43] sometimes merge.merge_inner doesn't merge anything? === salgado is now known as salgado-afk [20:06] graph.is_ancestor doesn't work? [20:32] Hi again. I'm playing with bzr svn-import (from bzr-svn, right ?). I still have some problems importing the svn repository with my not-so-standard layout [20:34] I've edited ~/.bazaar/subversion.conf, and added a layout for the repository [20:36] oh hey, I thought that'd be harder than editing a config file [20:36] shows how out of date I am [20:36] :) [20:37] mzz, it seems so be harder, because I get nothing interesting with that [20:37]