| [00:10] <JPeterson> how do i show the last x log entries? | |
| [00:13] <JPeterson> ok when its more than what the branch contains it shows only the branch for the oldest entry | |
| [00:21] <JPeterson> bzr branches list only "* (default)" how do i show the diff with the main branch "branch nick: calibre" | |
| [00:21] <JPeterson> from "branch nick: repo" | |
| [00:34] <JPeterson> bzr log -r-2 show only the second to last commit | |
| [00:35] <JPeterson> ok i have to use bzr log -l2 | |
| [00:55] <Enlik> when I needed to view difference between branches, I used (according to bzr diff --help) diff --old XXX --new XXX | |
| [00:57] <JPeterson> i SIGINTed a bzr commit and now bzr commit hangs without a messages, as if its waiting for stdin, but it doesnt seem to be | |
| [00:58] <JPeterson> because it doesnt read stdin | |
| [00:59] <JPeterson> bzr break-lock -v returns nothing | |
| [00:59] <JPeterson> also hangs | |
| [01:01] <Enlik> send some other signal to all of that process maybe (I'd try QUIT). And hope that interrupting bzr commit didn't break anything. | |
| [01:04] <JPeterson> a manual rm -rf .bzr/branch/lock/held released the lcok | |
| [01:20] <JPeterson> i cant figure out how rebase works from bzr rebase --help | |
| [01:20] <JPeterson> i want to edit the second to last commit | |
| [01:20] <JPeterson> i tried | |
| [01:20] <JPeterson> bzr rebase -r-2 . | |
| [01:21] <JPeterson> that returns | |
| [01:21] <JPeterson> Base branch is descendant of current branch. Pulling instead. | |
| [01:35] <JPeterson> here are the commands and question http://pastebin.com/9SFmWbUC | |
| [01:38] <jelmer> JPeterson: rebase doesn't allow you to edit commits, it just replays your current branch on top of another branch | |
| [01:40] <JPeterson> jelmer: how do i edit commit 2 in that example=? | |
| [01:40] <jelmer> JPeterson: what do you mean with "edit" exactly? | |
| [01:40] <JPeterson> change code or message | |
| [01:40] <jelmer> JPeterson: uncommit | |
| [01:43] * jelmer gets some sleep | |
| [01:47] <JPeterson> jelmer: i tried bzr uncommit --force -r-3 as in the updated paste http://pastebin.com/9SFmWbUC but i don't know how to --continue and apply the following commits | |
| [01:47] <JPeterson> and i dont know how do i apply the message after uncommit | |
| [01:49] <JPeterson> i guess if there are no feature as easy to use as git rebase -i i will accept a more verbose commit history, for example with single letter follo up commits | |
| [06:13] <portablejim_> I am a git user that is trying out bzr. I have a repository set up with a trunk dir for the single branch I have. I want to clone/branch the whole repository. Is it as simple as creating the folder(s) then branch'ing the remote trunk in? Or is a bzr init-repo needed? | |
| [06:17] <bob2> can't parse that | |
| [06:17] <bob2> but 'bzr branch' only branches one branch | |
| [06:17] <bob2> if you want git-ish behaviour, may want multi-pull | |
| [06:21] <portablejim_> I have ./burncontrol/trunk/<stuff> . ./trunk is the branch. Is ./burncontrol special? | |
| [06:22] <bob2> "bzr branch ./burncontrol/trunk/ /tmp/bonghits" will clone trunk | |
| [06:22] <bob2> I don't know what you did to ./burncontrol | |
| [06:22] <bob2> maybe you made it the repo root | |
| [06:23] <portablejim_> A bzr init-repo. | |
| [06:26] <portablejim_> Ok, so I have a shared repository. | |
| [06:30] <portablejim_> From my research, to "clone" the repo I 1) bzr init-repo /new-path/burncontrol 2) run 'bzr branch' for each branch into the shared repo? | |
| [06:37] <portablejim_> Do I have to set up every computer I want to pull from as a server? (it is unnecessary with git) | |
| [06:50] * portablejim_ fixes url and it works. | |
| [09:17] <ychaouche> Hi. Suppose I give a tarball with a .bzr in it. Do you have any means of determining wether I've given you a branch or a checkout ? | |
| [09:17] <lifeless> bzr info | |
| [09:20] <ychaouche> lifeless: http://pastie.org/5538133. Is that a branche or a checkout and how can you tell ? | |
| [09:20] <ychaouche> standalone tree => not checkout ? | |
| [09:21] <ychaouche> ah yes | |
| [09:22] <ychaouche> here it says checkout : http://pastie.org/5538137 | |
| [09:22] <ychaouche> thanks lifeless | |
| [09:22] <lifeless> np | |
| === yofel_ is now known as yofel | |