| alkisg | Hi, commits in git can be annotated with one-line descriptions and with multi-line comments, e.g. https://git.ipxe.org/ipxe.git/commit/fcc35bf48776fff9ebfd8db537679583221a9cd4. | 06:16 |
|---|---|---|
| alkisg | Is there a similar concept in bzr, where I would be able to only see the one-line descriptions e.g. with bzr log, but I would also have the ability to see the analytical comments about each commit with bzr detailed-log or something? | 06:16 |
| alkisg | Hmm it seems that git follows a convention similar to .deb package descriptions, i.e. leaving an empty line between the one-line description and the detailed commit message. | 06:25 |
| alkisg | Does bzr have something similar? | 06:25 |
| SamB | bzr log --line ? | 06:26 |
| * alkisg just found "git log --oneline", try ing "bzr log --line" now... | 06:31 | |
| alkisg | Yup, thank you SamB | 06:31 |
| === yofel_ is now known as yofel | ||
| jelmer | SamB: hi | 11:45 |
| === Quintasan_ is now known as Quintasan | ||
| jml | in a colo, how do I fetch & switch to a remote branch? | 14:50 |
| * SamB wants to joke "over SSH"" | 17:02 | |
| jelmer | jml: hi | 17:37 |
| jml | jelmer: hello | 17:37 |
| jelmer | jml: 'bzr branch --switch lp:foobar file:,branch=bar' | 17:37 |
| jelmer | or manually branch and then 'bzr switch bar' | 17:37 |
| jml | 'manually branch'? | 17:38 |
| jelmer | 'bzr branch lp:foobar file:,branch=bar; bzr switch bar' | 17:38 |
| jml | ahh. | 17:40 |
| jelmer | the syntax isn't ideal, we're still working on that | 17:40 |
| jelmer | it's hard to get to something that's not ambiguous | 17:40 |
| jml | jelmer: so there's 'switch -b' _and_ 'branch --switch' | 17:40 |
| jelmer | jml: yes, 'switch -b' bases the new branch on the current branch | 17:42 |
| jml | jelmer: that's a bit confusing. | 17:44 |
| jelmer | jml: in what way? | 17:46 |
| jml | jelmer: I guess in my head, 'switch -b' expands to 'switch --branch' (I know it expands to --create-branch) | 17:48 |
| jml | jelmer: and looking at 'branch --switch' vs 'switch --branch', I can't figure out which is for which purpose, or why the two would be any different | 17:49 |
| jml | I guess it's obvious when you try to implement it | 17:49 |
| jelmer | jml: I don't really like the -b alias for --create-branch | 17:49 |
| jelmer | jml: I think it's there for consistency with 'git checkout -b' | 17:49 |
| jml | jelmer: what would you propose instead | 17:49 |
| SamB | jelmer: pretty sure, yeah | 18:31 |
| SamB | I'm not sure I didn't suggest that? | 18:31 |
| AuroraBorealis | interesting thing i found: http://thread.gmane.org/gmane.comp.version-control.git/189776 | 19:05 |
| wgz | AuroraBorealis: that was quite interesting | 20:59 |
| AuroraBorealis | yeah | 21:00 |
| wgz | git not having great annotate performance is pretty well known | 21:00 |
| AuroraBorealis | its kinda related to that long standing bug where bzr was trying to import a huge repo | 21:00 |
| wgz | but the giant cold cache penalty seems... surprising | 21:00 |
| AuroraBorealis | its interesting to see how any vcs would handle freaking | 21:00 |
| AuroraBorealis | 1.3 million files | 21:00 |
| wgz | I guess it's very filesystem dependant for any operation that peeks at every file in a huge tree | 21:01 |
| AuroraBorealis | yeah. one of the suggestions was just | 21:01 |
| AuroraBorealis | "get some SSD's " | 21:01 |
| wgz | I think ext4 also doesn't have seperate metadata blocks? | 21:01 |
| wgz | so probably ends up needing to read from much more areas of the disk | 21:02 |
| AuroraBorealis | does it clump all the metadata together? | 21:02 |
| AuroraBorealis | so it doesn't have to skip around? | 21:02 |
| wgz | I think it doesn't, but some filesystems do, or do to some measure | 21:03 |
| AuroraBorealis | i have no idea about filesystems but i was just wondering if any VCS would handle such extreme repo sizes | 21:04 |
| wgz | some of the comercial ones are certainly more tuned for it. | 21:05 |
| wgz | but there's also a fair bit of cheating with big beefy central servers and partial checkouts I think | 21:08 |
| AuroraBorealis | people were suggesting just splitting it into different repos which just seems like a cop out to the real problem | 21:08 |
| wgz | which, in the dvcs world, the advice of having more smaller repos is sensible analogue | 21:09 |
| wgz | heh, you typed faster | 21:09 |
| wgz | but it's really the same kind of cheat | 21:09 |
| AuroraBorealis | yeah, i have no idea what facebook is keeping in there | 21:09 |
| AuroraBorealis | i hardly think that just the sourcecode to facebook is 1.3 million indepenent files | 21:10 |
| wgz | php *is* pretty bad :) | 21:10 |
| AuroraBorealis | haha | 21:12 |
| AuroraBorealis | i hear you there | 21:12 |
| Noldorin_ | hey jelmer | 23:30 |
| === GRiD_ is now known as GRiD | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!