File size: 3,232 Bytes
4aa5fce |
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 |
=== slank is now known as slank_away [00:45] <JPeterson> is bzr switch -b ther same as git checkout -b? [00:45] <lifeless> effectively [00:45] <JPeterson> but git checkout -b is instant, bzr switch -b has so far moved 1 g [00:48] <JPeterson> it seems to copy the entire source to .bzr\checkout\limbo\new-18 [00:48] <JPeterson> after 3 min it returned [00:48] <JPeterson> bzr: ERROR: Cannot switch a branch, only a checkout. [00:52] <JPeterson> this http://stackoverflow.com/questions/1645672/local-branches-with-bazaar seems to say branches are not supported [00:56] <jelmer> JPeterson: it's only supported in bzr 2.6 [00:56] <jelmer> and you'll need to use --force if you're using it in a location that doesnt contain branches already [00:56] <jelmer> *colocated [01:18] <lifeless> JPeterson: a shared repository will let switch -b be ~instant. [01:19] <JPeterson> ah [08:09] <bacon000> In bzr, is history sacred as in Mercurial, or can it be rewritten as in Git? [08:10] <bob2> don't think that's a good characterisation [08:10] <bob2> but bzr-rewrite exists [08:12] <bacon000> is that a plugin? [08:13] <lifeless> yes [08:13] <bob2> git lets you create new history, same as mercurial or bzr [08:15] <bacon000> I'm coming from the position that history can't be rewritten in Hg without a plugin. Sounds like bzr has a similar philosophy on this? [08:17] <bob2> that's a mischaracterisation of hg, but i guess bzr and hg are the same [08:18] <lifeless> bob2: its the popular understanding. [08:18] <lifeless> bob2: I think you're being just a little pedantic :) [08:19] <bob2> heh [08:20] <lifeless> bacon000: the bzr community treat changing the tip of a public branch to a revision that doesn't include the previous tip as a thing to avoid at nearly-all costs. [08:20] <lifeless> bacon000: which is I think the key thing you're referring to as being 'history is sacred' [08:21] <bacon000> yes, i think we're on the same page [08:26] <bacon000> I don't suppose anyone here is on Windows, are you? I'm trying to figure out why .bzr.log is stored in my Documents folder. [08:27] <lifeless> Thats the default, your $HOME [08:30] <bacon000> I would have thought it would go in \users\bacon000 instead of \users\bacon000\documents. === yofel_ is now known as yofel [14:05] <clyon> Hi! I have some random problems when I try to checkout a branch of GCC or GDB. [14:05] <clyon> After 20 to 25 minutes, I get: Connection Timeout: disconnecting client after 300.0 seconds [14:05] <clyon> some other times, it works well.... Any clue? === slank_away is now known as slank [15:19] <InvertedVantage> hi everyone [15:20] <InvertedVantage> I have a question [15:20] <InvertedVantage> what does it mean when bazaar cannot aquire lock "(local)"? [15:53] <InvertedVantage> hello? [16:06] <InvertedVantage> hello! can you help me with something please? how do I release a lock on a file using the GUI interface? === deryck is now known as deryck[lunch] [18:38] <idnar> so I was thinking of hacking my zsh prompt to show me which branch I'm in when I'm in a bzr-colo workspace [18:38] <idnar> is there a fast way to determine that, though? running bzr every time a prompt is printed probably doesn't count === deryck[lunch] is now known as deryck |