|
=== yofel_ is now known as yofel |
|
[12:58] <JPeterson> after "bzr switch -b name" how do i switch to "* (default)"? |
|
[12:59] <JPeterson> i tried "bzr switch default", "bzr switch", "bzr switch *" |
|
[13:01] <JPeterson> and 'bzr switch "(default)"' |
|
[13:08] <LeoNerd> Perhaps try bzr switch "" ? |
|
[13:13] <JPeterson> LeoNerd: i'mnot positibe thats intended because bzr branches doesnt indicate another branch |
|
[13:13] <jelmer> JPeterson: The asterisk indicates that you are already at that branch |
|
[13:13] <JPeterson> it seems to me that it's not designed to be able to switch back to (default) after at least one branch is created |
|
[13:14] <JPeterson> can i remove the second to last commit? |
|
[13:14] <jelmer> JPeterson: '(default)' doesn't have a name, so if you switch away from it it will be lost |
|
[13:14] <jelmer> JPeterson: you can create a name for it by using 'bzr switch -b newname' |
|
[13:15] <LeoNerd> I don't tend to use switch, anyway.. disk is cheap; if I want a new branch on disk I'll just create a new sibling directory |
|
[13:15] <LeoNerd> That way I don't have to play silly "make clean" tricks from time to time when files change, anyway |
|
[13:15] <LeoNerd> I find it a lot neater that way |
|
[13:17] <JPeterson> 2.6 fixed the primary shortcoming of not having branches |
|
[13:17] <JPeterson> however it seems like i cant remove previous commits or reorder commits, as with git rebase -i |
|
[13:17] <JPeterson> i would place that as the second shortcoming after branches |
|
[13:18] <fullermd> What is? |
|
[13:18] <LeoNerd> You can uncommit (bzr uncommit), and you can reply |
|
[13:18] <LeoNerd> replay |
|
[13:18] <LeoNerd> On the rare times I want to reorder some commits, I branch from the unwind point, then use "bzr replay" to replay commits into the right order |
|
[13:19] <JPeterson> ya |
|
[13:19] <JPeterson> launchpad should use git instead |
|
[13:19] <JPeterson> would save jelmer 5000 commits |
|
[13:19] <LeoNerd> But then I mostly work with bound branches, so such things would be a: rude, and b: largely unnecessary, as things hardly ever go into the trunk in the wrong order in the first place :) |
|
[13:20] <LeoNerd> Usually my reordering fixups are just for cases like having a spare commit that I made offline on the train over the top of a stale branch because I forgot to update my laptop before I left |
|
[13:23] <JPeterson> bzr uncommit returned |
|
[13:23] <JPeterson> Cannot expand "commit_data": Dicts do not support option expansion |
|
[13:23] <JPeterson> i dont see what that means though |
|
[13:23] <JPeterson> i dont see any effect of it |
|
[13:24] <jelmer> JPeterson: "bzr log" should show one revision less |
|
[13:25] <JPeterson> jelmer: thats without that message too |
|
[13:26] <JPeterson> i dont see an effect unique to that message |
|
[13:26] <jelmer> JPeterson: that message is just an error from a plugin hook that doesn't work I think |
|
[13:26] <JPeterson> allright |
|
[13:28] <k_sze> bzr is not checking SSL certificate for xmlrpc.launchpad.net. If I'm paranoid, how can I make it check? |
|
[13:30] <k_sze> In fact, why is it not checking the SSL certificate by default? This is a fresh installation of bzr on Mac OS X, using MacPorts. |
|
[13:33] <jelmer> k_sze: 2.5 should check SSL certificates IIRC |
|
[13:33] <jelmer> k_sze: what version are you using? |
|
[13:33] <jelmer> I'm not sure if it does it for xmlrpc.launchpad.net too, though |
|
[13:34] <k_sze> I have 2.5.1 |
|
|