| Raim | hi | 00:11 |
|---|---|---|
| Raim | what should I do if bzr instructs me to run 'bzr upgrade' but then it tells me that it is already at the latest format version? | 00:11 |
| Raim | see http://pbot.rmdir.de/c09c1e95ebc98ddbc7148e2c3a228cc8 | 00:11 |
| Peng_ | Raim: It's telling you to upgrade http://code.bitlbee.org/bitlbee/ | 00:13 |
| Peng_ | Damn LF. | 00:13 |
| Peng_ | Raim: , not your local repo. | 00:13 |
| Raim | Peng_: ah! | 00:13 |
| Peng_ | Actually, it's telling you to upgrade http://code.bitlbee.org/. | 00:13 |
| Raim | yeah, I understand | 00:13 |
| Raim | and by reading the message again it even said exactly that | 00:14 |
| Peng_ | Unless you actually run code.bitlbee.org, you can't fix it, but it does encourage you to send them an email, and it helps explain why you'll have awful performance pulling from that repo. :"D | 00:15 |
| Peng_ | s/"// | 00:16 |
| itistoday | hi there, i'm new to bazaar and DVCS in general, was wondering if someone could help explain to me what the difference between 'pull' and 'merge' is? | 00:22 |
| === Kissaki is now known as Kissaki^0ff | ||
| mzz | that had better be in the manual, it's kinda important | 00:36 |
| * mzz checks | 00:36 | |
| mzz | itistoday: "pull" either turns the branch you're running it in into a copy of the branch you're pulling from (while keeping any uncomitted changes) or complains if it can't do so because you have committed changes that aren't in the branch you're pulling | 00:39 |
| flvr8 | it isn't explained well in the user guide, but the man page has a good concise summary (i.e. man bzr) | 00:39 |
| mzz | itistoday: "merge" should only be done on a branch with no uncommitted changes and combines anything you've committed with anything in the branch you merge that you don't have yet, after which you get to review the result and commit it if it makes sense | 00:40 |
| mzz | weird that this isn't explained properly in the manual, imho it's kinda important to understand the difference | 00:40 |
| itistoday | thanks, although sorry, i'm still a little confused... so first, for both 'pull' and 'merge' you need to have an existing branch to run the command from? | 00:42 |
| mzz | itistoday: it is important to realise that merge is normally done in a clean working dir, and you need to commit the result if it makes sense. "merge" always creates a brand new revision nobody else has yet, even if the resulting text is identical to some revision that already exists. pull fast-forwards, you don't add any revisions other than what you're pulling in. | 00:42 |
| mzz | yes, both pull and merge need two branches | 00:42 |
| itistoday | so... I'm assuming the answer to this is 'no', but is then 'pulling' simply merging and then committing? if no, then what's the difference? | 00:43 |
| mzz | itistoday: if in doubt pulling if you can and merging if pull complains will often work, but in some workflows you may want to explicitly commit a merge even though a pull would be possible. | 00:43 |
| mzz | itistoday: pull does not create any new revisions that aren't already in the branch you're pulling. after merge you always have to commit the result (even if there are no conflicts) | 00:44 |
| mzz | itistoday: (this also means that you can merge and then revert if you did not like the result. With pull you'd have to remember the previous revision yourself to be able to do that) | 00:45 |
| itistoday | mzz: thanks, kinda getting it, still have more questions tough, so then is 'pull' as if you were to remove your entire local branch and use the 'branch' command? | 00:46 |
| mzz | itistoday: yep | 00:46 |
| itistoday | ok... that makes a whole lot more sense | 00:46 |
| mzz | itistoday: but only if you don't have any revisions locally that aren't in what you pull. If you do it'll complain that the branches have diverged. | 00:46 |
| mzz | itistoday: so other than that you can't easily undo it if you don't quite remember what the previous revision was, and assuming no *uncommitted* local changes, "pull" is quite safe | 00:47 |
| itistoday | mzz: does that mean: local branch must have a revision number less than the one from where you're pulling? | 00:47 |
| mzz | itistoday: revision numbers in bzr confuse me. You'll have to read the manual for that one. | 00:47 |
| itistoday | i guess that was a bad question, but essentially does that mean that you cannot have made any changes to the branch you have that are not in the one you're pulling from? | 00:48 |
| mzz | itistoday: (what if you committed one extra revision and you're pulling from a branch that has two (unrelated) new revisions?) | 00:48 |
| mzz | itistoday: no *committed* changes, yes. | 00:49 |
| mzz | itistoday: "pull" will attempt to keep uncommitted changes (just like "up" does in things like svn and cvs) | 00:49 |
| itistoday | ok, cool :-) i think i get pull now | 00:50 |
| itistoday | thanks! | 00:50 |
| mzz | itistoday: actually so will merge, but using that is usually a bad idea, since it means it's hard to tell which changes are part of the merge and which are yours! | 00:50 |
| itistoday | that was going to be my next question | 00:50 |
| itistoday | so you can merge when you have uncommitted changes? | 00:50 |
| Peng_ | By default, merge yells at you if you have uncommitted changes. You have to pass --force to do it. | 00:50 |
| mzz | ah, I didn't know that. | 00:51 |
| itistoday | Peng_: thanks! What does the --uncommitted option mean? | 00:51 |
| mzz | (because I'm pretty good at making sure I have no uncommitted changes before merging myself) | 00:51 |
| itistoday | --uncommitted: "Apply uncommitted changes from a working copy, instead of branch changes." | 00:51 |
| itistoday | does that mean only grab the uncommitted files from the place you're merging from? | 00:52 |
| Peng_ | itistoday: Yeah. | 00:52 |
| Peng_ | itistoday: That merges the uncommitted changes in the source branch's working tree into yours, instead of merging the new revisions and ignoring the working tree. | 00:52 |
| itistoday | that's really weird | 00:52 |
| Peng_ | It's really useful. | 00:53 |
| mzz | I don't think I've used that, but that's my fault. | 00:53 |
| itistoday | i'm sure, i'm just new to this entire thing, it's all fascinating to me | 00:53 |
| Peng_ | Say you're making some changes in a branch, but then decide they should be in a new branch. Do "bzr branch", "bzr merge --uncommitted", and then "bzr revert" in the source branch. Bang! | 00:53 |
| mzz | I think I'd usually end up just committing those uncommitted changes to the other branch, then merging regularly. | 00:53 |
| mzz | ah, that's actually useful. | 00:53 |
| itistoday | Peng_: great example! thanks | 00:54 |
| mzz | although unsurprisingly there are other ways to do that :) | 00:54 |
| itistoday | so, one other thing regarding pull.. in the user's guide part 6.2.3: | 00:54 |
| itistoday | 6.2.3 Refreshing a mirror branch | 00:55 |
| itistoday | "Use the pull command to do this:" | 00:55 |
| itistoday | cd trunk; bzr pull | 00:55 |
| itistoday | that seems to be similar to 'update' | 00:55 |
| itistoday | what's the difference? | 00:55 |
| Peng_ | itistoday: Pull is about branches, while update is about working trees. | 00:55 |
| itistoday | ok, the terminology still hasn't stuck quite yet, is this right: pull is more granular than update? i.e. update does it for all the branches..? | 00:56 |
| mzz | "up" becomes important if you have working trees and their corresponding branch in different locations. | 00:56 |
| Peng_ | itistoday: Pull is "copy new revisions from branch X to Y". The pull command also implicitly runs "bzr update". Update is "update my working tree with new changes in branch X". | 00:57 |
| itistoday | Peng_: does 'new revisions' there mean the 'history' from branch X to Y? | 00:58 |
| mzz | sounds right to me | 00:58 |
| itistoday | and then 'update' takes the latest history and makes it visible to the file system for you to work? | 00:58 |
| Peng_ | itistoday: Yeah. | 00:58 |
| mzz | yep | 00:58 |
| itistoday | awesome! thank you both very much for helping explain this :-) | 00:59 |
| mzz | itistoday: if this is just the result of "bzr branch" (aka "get") you'll end up with working tree and branch in the same spot, and won't have much use for "update" | 00:59 |
| mzz | itistoday: but there are ways to get the branch revision updated that don't automatically update the working tree afterwards, in which case you'll need "update". It'll probably be obvious once it happens. | 00:59 |
| mzz | err, branch history, not revision | 01:00 |
| mzz | "bzr help working-trees" mentions a few, I think | 01:00 |
| itistoday | mzz: thanks, i'll keep that in mind | 01:01 |
| itistoday | i looked over a quick git tutorial, it seems to take a different approach with where branches are stored, i.e. it seems like the entire folder contains the repository | 01:01 |
| mzz | does someone know if there's a plugin I overlooked that automates creating a new branch for a lightweight checkout and switching to it? | 01:01 |
| mzz | itistoday: I haven't used git much, but see 10.2.5 in the manual | 01:02 |
| mzz | I use a variation of that setup: my lightweight checkout isn't below the repository. | 01:03 |
| itistoday | mzz: k, reading... | 01:03 |
| mzz | I'm looking for a more convenient way to do the "bzr branch ...", "bzr switch ..." mentioned there. | 01:03 |
| mzz | perhaps I should just write a plugin. | 01:03 |
| * mzz throws together a "relswitch" plugin | 01:05 | |
| flvr8 | is there a generalized way to create server aliases, a la "lp"? | 01:06 |
| mzz | flvr8: I just came across the "bookmark" plugin, which may do what you want | 01:06 |
| flvr8 | thanks, will take a look | 01:06 |
| Peng_ | flvr8: Better than writing Python code, you mean? | 01:08 |
| flvr8 | Peng_: heh, i take it "lp" is hardcoded somewhere? are there other "presets"? | 01:09 |
| mzz | oh, huh. ":this" partially fixes what was annoying me. | 01:10 |
| mzz | flvr8: "lp:" is a bit fancier than it looks (deals with logins and some transformations of the path too iirc, it's not just a fixed prefix) | 01:11 |
| itistoday | mzz: that seems a bit different from how git does it, i think. i think git sortof hides the branches from you, whereas with bzr you have to have the directory structure already laid out (repo/branches), i think git does (folder <- invisible branches) | 01:11 |
| flvr8 | mzz: ah, of course | 01:11 |
| mzz | itistoday: git does have a directory structure, but it's below .git, iirc. | 01:11 |
| mzz | itistoday: I suck at git, but afaict it's considered acceptable to peek inside .git. That's *much* less common with .bzr. | 01:12 |
| itistoday | mzz: ah ok, then it should be possible to do something similar with 'bzr'? | 01:12 |
| mzz | itistoday: well, I do think the two are pretty similar, but I haven't compared them in any amount of depth :) | 01:12 |
| mzz | itistoday: I just found out about the magical ":this" location which points at the current branch. I think that can make them more similar | 01:14 |
| mzz | let's see | 01:14 |
| itistoday | the idea would be to have a branch with a .bzr folder in it, and to be able to change the working directory of that to another branch, without changing the folder's location | 01:15 |
| mzz | I don't think you can have a .bzr folder, but you can have a .hidden-repo folder. Give me a minute, experimenting. | 01:15 |
| itistoday | k | 01:15 |
| itistoday | the .hidden-repo folder would have to reside within the branch itself... i'm not sure if that's possible with bazaar, which i think expects the repo to be the parent folder | 01:17 |
| mzz | yay lightweight checkouts | 01:18 |
| mzz | itistoday: haven't thought this through, but http://paste.pocoo.org/show/125465/ | 01:19 |
| mzz | itistoday: note that putting the checkout inside the repo works just fine (that's how that example in the manual I mentioned does it) | 01:20 |
| mzz | itistoday: I'm interested in doing it this way because I have my repo on a network mount while I want my checkout to be local. | 01:20 |
| itistoday | mzz: so initially in that example :this points to .hidden-repo/trunk ? | 01:21 |
| mzz | itistoday: yeah, because that's what we checked out | 01:22 |
| itistoday | with the checkout, do you still have access to all the revisions? | 01:22 |
| mzz | itistoday: as long as the repository is reachable | 01:22 |
| mzz | err, as long as the branch is reachable is better | 01:22 |
| mzz | it's a lightweight checkout, which means it has just a working tree. For anything involving history it needs the branch and its repository | 01:23 |
| itistoday | which it transparently accesses? | 01:23 |
| mzz | itistoday: might actually want to peek at what ends up in .bzr to understand what's going on here, imho. | 01:24 |
| mzz | itistoday: the checkout remembers the location of its branch | 01:24 |
| itistoday | mzz: so the lightweight checkout acts as an alias to the branch? | 01:24 |
| mzz | see "bzr help checkouts" | 01:25 |
| itistoday | thanks, yeah, it seems like an alias | 01:26 |
| mzz | oh, I forgot --no-trees on the init-repo | 01:26 |
| itistoday | what does that do? | 01:26 |
| itistoday | er... i'll have a look at the manual | 01:26 |
| mzz | stop it from putting working directories in .hidden-repo, which is kinda silly here | 01:26 |
| itistoday | cool, that makes sense, thanks for the example :-) | 01:27 |
| mzz | notice there's very little to a branch without a working tree: just a revision id, tags, and branch.conf | 01:28 |
| itistoday | neat | 01:29 |
| itistoday | but yeah, i think the main difference here between git is that with bzr the repo must be in a different directory than the working tree | 01:30 |
| mzz | and bzr gives you quite a bit of flexibility in where you put the repo, the branch, and the working tree (in the same place is simplest, but you can spread them out a bit too) | 01:30 |
| mzz | you might even be able to put the repo inside the checkout and .bzrignore it | 01:30 |
| itistoday | now that would be cool | 01:31 |
| mzz | well, I think it'd be confusing. | 01:31 |
| mzz | if you mess up the .bzrignore you could end up committing the repo to itself, or something equally daft. | 01:31 |
| mzz | let's see though. | 01:31 |
| Peng_ | flvr8: lp: is provided by the built-in Launchpad plugin (bzrlib.plugins.launchpad), using bzrlib's directory service API. You could totally write a plugin to provide something similar, but you can't just add "foo: = http://bzr.foo.org/" to some config file. | 01:32 |
| mzz | the bookmark plugin mostly does just that, iiuc | 01:32 |
| mzz | itistoday: http://paste.pocoo.org/show/125470/ does seem to work, although I still think it's confusing. | 01:34 |
| flvr8 | Peng_: thanks | 01:35 |
| mzz | itistoday: to improve this setup further you'd want a :repo alias so you don't have to specify those paths relative to the branch | 01:37 |
| itistoday | mzz: thanks! is there any easy way to set that alias? | 01:37 |
| flvr8 | does anybody have experience with the bzr-emailer-notifier script? it's sending emails ok for two of the repositories, but not the third. (and there are a bunch of 'No handlers could be found for logger "bzr" errors' in the log, which makes me wonder if it's hung up on a lock per #141172 or #172392 -- any way to tell?) | 01:37 |
| mzz | itistoday: and adding that to bzr is pretty trivial, although it is arguably a misfeature because branches are normally just an optimization, you're not supposed to care about their location | 01:37 |
| mzz | itistoday: I'm tempted to just write it anyway though. | 01:38 |
| mzz | lemme grab a snack and do that. | 01:38 |
| itistoday | mzz: :-) | 01:38 |
| itistoday | wow this is neat | 01:41 |
| itistoday | so, i did something very similar to what you did, mzz | 01:41 |
| itistoday | except i had a branch to start with already | 01:42 |
| itistoday | so after creating the repo in the branch (.bzr-repo) | 01:42 |
| itistoday | i branched to it like this: bzr branch . .bzr-repo/trunk | 01:42 |
| itistoday | then I deleted everything inside the folder *except* for the .bzr-repo folder | 01:42 |
| itistoday | and did a lightweight checkout from the .bzr-repo/trunk | 01:43 |
| itistoday | and now it appears i have the same setup | 01:43 |
| mzz | yep (remember to make that a --no-trees repo, bit faster that way) | 01:43 |
| itistoday | yeah i did :-) | 01:44 |
| itistoday | is there a bzr command though to do what i did via rm -rf and bzr checkout --lightweight? | 01:44 |
| itistoday | i.e. turning the current branch into a checkout from someplace else? | 01:44 |
| itistoday | it seems like a dangerous thing to do though so there might not be | 01:44 |
| itistoday | just want to know if what i did would be the standard way of doing that | 01:45 |
| mzz | lemme see | 01:45 |
| mzz | itistoday: bzr reconfigure --lightweight-checkout --bind-to .bzr-repo/trunk . | 01:48 |
| itistoday | wowww | 01:49 |
| itistoday | let me see if that works... | 01:49 |
| itistoday | incredible | 01:52 |
| itistoday | bazaar is awesome :-) | 01:52 |
| itistoday | i might write a blog post on this if that's OK? i'll of course be sure to credit you and your examples | 01:52 |
| mzz | mmm, drat. "lookups" is not an instance variable, so I can't just hack up the existing AliasDirectory so you get the same style of alias. Oh well. | 01:52 |
| itistoday | i think people would be interesting for the git people to know that this can be done in bazaar | 01:53 |
| itistoday | *think people = think it | 01:53 |
| itistoday | how does the autocompletion work in bzr shell? | 01:58 |
| itistoday | i type 'br[tab]' and it just puts a tab | 01:58 |
| mzz | itistoday: meh. Try http://paste.pocoo.org/show/125474/ (put in ~/.bazaar/plugins, then turn the ":this/.." in earlier examples into "repo:") | 02:10 |
| * mzz found various fun locations differing from the one he wanted | 02:11 | |
| mzz | itistoday: tab-completion works for me | 02:12 |
| itistoday | i'm on OS X | 02:12 |
| itistoday | oh well, not a big deal | 02:12 |
| itistoday | re plugin: neat! | 02:12 |
| itistoday | ill try it right now :-D | 02:12 |
| mzz | (I was ending up with locations at various spots below .bzr, which wasn't what I wanted) | 02:13 |
| mzz | (took me a while to realise I had to go through .bzrdir) | 02:13 |
| itistoday | it might be useful for me to learn python at this point, if only to be able to customize bzr to my liking :-) | 02:13 |
| itistoday | not sure what what you mean ..? | 02:14 |
| mzz | can be quite useful to do ad hoc scripts or plugins | 02:14 |
| mzz | just that I was getting the code wrong initially | 02:14 |
| itistoday | how do i setup the plugin folder properly with this paste? | 02:15 |
| itistoday | i've always seen plugins as directories, and they usually have some sort of specific setup with an __init__.py file in it | 02:15 |
| itistoday | mzz: ping | 02:18 |
| mzz | itistoday: http://paste.pocoo.org/show/125477/ is slightly cleaner | 02:19 |
| itistoday | mzz: how do I setup the plugin though? | 02:20 |
| mzz | itistoday: just store as ~/.bazaar/plugins/repoalias.py, or ~/.bazaar/plugins/repoalias/__init__.py if you prefer | 02:20 |
| itistoday | doesn't seem to work via the second method... | 02:21 |
| itistoday | Unable to load plugin 'repoalias' from '/Users/gslepak/.bazaar/plugins' | 02:22 |
| itistoday | Unable to load plugin 'repoalias' from '/Users/gslepak/.bazaar/plugins' | 02:22 |
| itistoday | err, sorry for the dup | 02:22 |
| mzz | no? urgh, now what did I do wrong | 02:23 |
| itistoday | mzz: have you tried it? | 02:23 |
| mzz | there should be a message above the failure | 02:23 |
| mzz | yes, I have | 02:23 |
| mzz | well, I've tried way one, and I can't think of a reason for way 2 to fail | 02:23 |
| mzz | (don't do both at the same time though) | 02:23 |
| itistoday | i tried method 1 too | 02:23 |
| itistoday | same message | 02:23 |
| itistoday | wonder if there's any way to get what the reason is? | 02:24 |
| mzz | no further output? Also check ~/.bzr.log | 02:24 |
| itistoday | yeah, there is | 02:25 |
| itistoday | 1 sec | 02:25 |
| itistoday | http://paste.pocoo.org/show/125478/ | 02:25 |
| itistoday | doesn't seem to like RepositoryDirectory | 02:26 |
| mzz | that traceback makes no sense to me | 02:27 |
| mzz | oh wait | 02:27 |
| mzz | itistoday: how did you paste this code over? Did you accidentally end up with the call to directory_service.directories.register indented? | 02:28 |
| itistoday | let me check | 02:28 |
| itistoday | yes | 02:28 |
| itistoday | sorry, i don't know python | 02:28 |
| mzz | itistoday: indentation is syntax in python. Using the "download" button of the pastebin is strongly recommended. | 02:28 |
| mzz | (under "paste details") | 02:29 |
| mzz | or I guess I could just stuff this thing on launchpad | 02:29 |
| itistoday | k, will remember that from now on for python code | 02:29 |
| itistoday | ok that seemed to work :-) | 02:30 |
| itistoday | although i'm probalby using it incorrectly: bzr branch . :repo/expirmental | 02:30 |
| itistoday | bzr: ERROR: ":repo/expirmental" is not a valid location alias. | 02:30 |
| mzz | itistoday: repo:, not :repo. Sorry about that. | 02:31 |
| itistoday | :-D | 02:31 |
| itistoday | mzz: thanks! sorry about that | 02:31 |
| itistoday | i like that syntax a lot actually | 02:31 |
| mzz | I actually think I like repo: better, so I think I'll keep it | 02:31 |
| itistoday | yeah | 02:31 |
| itistoday | definitely | 02:31 |
| mzz | hmm, what to call the plugin | 02:32 |
| itistoday | mzz: you might want to consider making this a real plugin? | 02:32 |
| itistoday | i think lots of people would find this useful | 02:32 |
| mzz | hardest part: think of a name | 02:32 |
| itistoday | repoalias is pretty good i think... | 02:32 |
| mzz | repoalias it is | 02:32 |
| itistoday | :-) | 02:32 |
| itistoday | yup, seems like it | 02:34 |
| mzz | itistoday: just give me a minute, pushing etc | 02:36 |
| itistoday | mzz: sure :-) | 02:36 |
| * mzz is figuring out whether lp can host branches without having a whole project for them | 02:38 | |
| wgrant | mzz: Use +junk in place of the project name. | 02:38 |
| mzz | "bzr push lp:+junk/repoalias" fails | 02:39 |
| wgrant | mzz: You need your username in there too. | 02:39 |
| wgrant | bzr push lp:~username/+junk/branch | 02:39 |
| mzz | yeah, got it. Thanks! | 02:39 |
| mzz | itistoday: bzr get lp:~marienz/+junk/repoalias | 02:40 |
| itistoday | mzz: awesome, thanks! | 02:41 |
| itistoday | if I get time i'll write a blog entry on this plugin and using bazaar like git here: http://taoeffect.com/blog | 02:42 |
| mzz | notice this is just a hack so far, I don't know if there are any gotchas if you actually use this | 02:44 |
| itistoday | mzz: k, will be sure to mention that if i post it | 02:45 |
| mzz | added it to the list on the wiki too | 02:48 |
| mzz | I guess I'll turn it into a proper lp project if people use it | 02:48 |
| itistoday | just used it with merge, seems to be working fine :-) | 02:48 |
| itistoday | mzz: if i find any bugs in it, what would be the best way to report them to you? | 02:49 |
| * mzz wonders if launchpad has a way to file bugs on a person instead of a project | 02:51 | |
| mzz | itistoday: I'm actually more reachable through irc than through email, I'm weird like that. Just poke me in here. | 02:52 |
| itistoday | mzz: k, sure thing, yeah, and it would be neat if launchpad could do that, although if you decide to turn it into a project that would solve it | 02:52 |
| itistoday | already, i'm heading out, thanks again mzz for all your help, and the awesome plugin! | 02:59 |
| === davidstrauss_ is now known as davidstrauss | ||
| kfogel | If I see this: | 07:36 |
| kfogel | working tree: Working tree format 4 | 07:36 |
| kfogel | branch: Branch format 6 | 07:36 |
| kfogel | repository: Development repository format - rich roots, group compression and chk inventories | 07:36 |
| kfogel | ... from 'bzr info -v', does that mean I'm using brisbane core? | 07:36 |
| wgrant | 'chk inventories' == brisbane core | 07:37 |
| wgrant | Not sure if that's 2a, though. | 07:37 |
| mwhudson | 2a has branch7 too | 07:37 |
| mwhudson | kfogel: run bzr upgrade --2a in the *branch* directory | 07:38 |
| wgrant | Right, my 2a has that repository type but branch7 | 07:38 |
| mwhudson | (it will be very quick) | 07:38 |
| mwhudson | although | 07:38 |
| mwhudson | you should probably recreate the working tree too | 07:38 |
| kfogel | mwhudson: this is the mysql-server branch that I created, using the script you've seen by email. I ran 'bzr upgrade --2a mysql-server' to get this! | 07:39 |
| mwhudson | kfogel: it's a standalone branch? | 07:40 |
| kfogel | mwhudson: yes | 07:40 |
| wgrant | I though branch7 was only needed for stacking. Does 2a force it just because it's a good opportunity? | 07:40 |
| kfogel | mwhudson: it is not in a repo other than itself | 07:41 |
| mwhudson | kfogel: strange! | 07:41 |
| mwhudson | wgrant: yes, i think so | 07:41 |
| mwhudson | wgrant: any client that can understand a chk repo can certainly understand branch7 | 07:42 |
| wgrant | mwhudson: That is true. | 07:42 |
| kfogel | mwhudson: this appears to be bzr 1.16, not 1.16.1, fwiw (it's on devpad). | 07:42 |
| mwhudson | kfogel: i don't think any of the fixes will have made a difference here | 07:43 |
| mwhudson | kfogel: you did run reconcile before updgrade, right? | 07:43 |
| kfogel | mwhudson: yup. I just ran that script, as per my email. | 07:44 |
| mwhudson | good | 07:44 |
| wgrant | What benefit does the reconcile bring? | 07:44 |
| mwhudson | well, you could try running bzr upgrade --2a again... | 07:44 |
| wgrant | (apart from making a nice heater) | 07:44 |
| mwhudson | wgrant: inconsistent revision information in the revision graphs can mess the conversion up | 07:45 |
| mwhudson | (i don't really know the details tbh) | 07:45 |
| * mwhudson goes to cook dinner | 07:45 | |
| wgrant | mwhudson: Ah, right. | 07:46 |
| kfogel | mwhudson: bzr upgrade --2a will take another four days? | 07:46 |
| mwhudson | kfogel: it really shouldn't | 07:46 |
| mwhudson | changing the branch format is easier | 07:46 |
| mwhudson | maybe tar it up first though... | 07:46 |
| kfogel | time bzr upgrade --2a | 07:47 |
| kfogel | starting upgrade of file:///home/kfogel/lp-testing/mysql-server/ | 07:47 |
| kfogel | making backup of file:///home/kfogel/lp-testing/mysql-server/.bzr | 07:47 |
| kfogel | to file:///home/kfogel/lp-testing/mysql-server/backup.bzr | 07:47 |
| kfogel | bzr: ERROR: File exists: u'/home/kfogel/lp-testing/mysql-server/backup.bzr/': [\ | 07:47 |
| kfogel | Errno 17] File exists: '/home/kfogel/lp-testing/mysql-server/backup.bzr/' | 07:47 |
| mwhudson | rm -rf backup.bzr | 07:47 |
| kfogel | mwhudson: done (well, moved it elsewhere). now re-running | 07:48 |
| kfogel | mwhudson: thanks for taking time out from cooking dinner | 07:48 |
| kfogel | mwhudson: upgrade completed :-) | 07:49 |
| kfogel | 22 milliseconds | 07:49 |
| kfogel | bzr info -v now says branch format 7 | 07:50 |
| mwhudson | kfogel: yay | 08:31 |
| === lamont` is now known as lamont | ||
| Lo-lan-do | G'day all… | 16:18 |
| Lo-lan-do | I'm reading http://bazaar-vcs.org/Roadmap/BrisbaneCore/PlusOne and the last feature listed there appeals to me for a client. | 16:20 |
| Lo-lan-do | Any hint whether we're talking months or years here? | 16:20 |
| === Kissaki^0ff is now known as Kissaki | ||
| Glenjamin | is there a mirror for bzr downloads somewhere? lp seems to be down | 16:53 |
| james_w | Glenjamin: should be back up | 17:31 |
| Glenjamin | mm, got it now | 17:36 |
| Glenjamin | altho i'm having a problem installing bzrtools on linx | 17:36 |
| Glenjamin | i;ve installed bzr and bzrtools via easy_install, but they both seem to be eggs, instead of bzrtools going into the plugins folder | 17:37 |
| SamB | Glenjamin: but does "bzr plugins" list bzrtools? | 18:54 |
| === asabil_ is now known as asabil | ||
| === Noya_ is now known as Noya | ||
| Glenjamin | SamB: cheers for replying, i figured our that easy_install did an egg, which didnt work - but setup.py install did it properly | 23:11 |
| === Kissaki is now known as Kissaki^0ff | ||
| === RAOF__ is now known as RAOF | ||
| dobey | abentley: not around are you? | 23:58 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!