| === BasicMBP is now known as BasicOSX | ||
| achiang | question on how bzr handles history and binary objects - let's say i have a repo where someone committed 100 jpgs in the first commit and it takes an excessively long time to clone. now, many commits later, if we bzr rm those jpgs, will the main branch still take ages to pull from LP? | 11:54 |
|---|---|---|
| beuno | achiang, it will for the first time, yes | 12:03 |
| beuno | achiang, they are there forever and ever* | 12:03 |
| beuno | *unless you do something icky like rebase and break compatibility with existing branches | 12:04 |
| achiang | beuno: are there any tricks i could play? | 12:04 |
| achiang | hm | 12:04 |
| achiang | rebase | 12:04 |
| achiang | yeah | 12:04 |
| achiang | can you bzr pull without grabbing all the history, perhaps? | 12:05 |
| achiang | maybe something related to "shallow" ? | 12:06 |
| beuno | achiang, I don't believe partial history was ever implemented | 12:06 |
| beuno | maybe a lightweight checkout | 12:06 |
| beuno | maybe | 12:06 |
| achiang | does bzr even have rebase? | 12:07 |
| achiang | bzr help says no | 12:07 |
| beuno | not by default | 12:07 |
| bob2 | not built in | 12:07 |
| beuno | there's: http://wiki.bazaar.canonical.com/Rewrite | 12:07 |
| bob2 | bzr-rewrite | 12:07 |
| beuno | achiang, keep in mind once you rebase, all existing branches out there are incompatible/unmergeable | 12:08 |
| achiang | ugh, yeah | 12:08 |
| achiang | it might be better to do a rebase and then create a brand new branch | 12:09 |
| * beuno nods | 12:09 | |
| achiang | beuno: but what if the existing branches out there are only "leaf" branches... that is, i do not expect any incoming MP's from them? | 12:09 |
| beuno | achiang, then it shouldn't matter | 12:09 |
| beuno | they won't be able to pull anymore without doing something like --overwrite | 12:10 |
| achiang | beuno: could an existing leaf branch still successfully pull from lp:project ? | 12:10 |
| achiang | ah | 12:10 |
| achiang | a one-time --overwrite for the 1 or 2 people with the branch | 12:10 |
| beuno | yeah, all the answers around this are going to to suck :) | 12:10 |
| * beuno nods | 12:10 | |
| beuno | if it's a small amount of people, it's manageable | 12:11 |
| achiang | changing the branch name isn't fun either | 12:11 |
| achiang | we actually have more consumers of that | 12:11 |
| beuno | achiang, well, if you create a new branch, LP maps whatever to lp:projectname | 12:11 |
| beuno | so I think that would be fine | 12:11 |
| achiang | (but they have ephemeral environments and do brand new pulls every time) | 12:11 |
| achiang | oh, that's interesting | 12:12 |
| beuno | lp:projectname is a symlink, in that sense | 12:12 |
| achiang | got it | 12:12 |
| achiang | so i currently have 'trunk' and lp:project maps to trunk | 12:12 |
| achiang | if i were to create say... trunc, i could remap lp:project to trunc? | 12:13 |
| achiang | could i then delete trunk | 12:13 |
| beuno | well, you have ~someteam/someproject/trunk | 12:13 |
| achiang | and rename trunc => trunk? | 12:13 |
| beuno | yes | 12:13 |
| achiang | (the trunc is short for truncate, which is what i want to do with those jpegs ;) | 12:14 |
| achiang | puns! everywhere! | 12:14 |
| * beuno regrets helping | 12:16 | |
| achiang | boo | 12:16 |
| achiang | so this is interesting | 12:21 |
| achiang | the giant blobs were all added in literally -r 1 | 12:22 |
| achiang | but nothing else from -r 1 has survived over time | 12:22 |
| achiang | so i wonder if that means my rewrite command will be easier, since nothing from that bad commit even remains anymore | 12:22 |
| beuno | achiang, yeah, it may be easier to rewrite and chop off the first commit | 12:25 |
| achiang | how do i install this plugin? | 12:26 |
| bob2 | note that everyone still needs to reclone | 12:28 |
| achiang | bob2: noted | 12:28 |
| beuno | achiang, IIRC, you throw it in ~/.bazaar/plugins | 12:29 |
| beuno | just branch it in there | 12:29 |
| achiang | ah, ok | 12:29 |
| jelmer | achiang: please be warned that bzr-rewrite is a little bit rough around the edges | 12:32 |
| achiang | jelmer: define "rough" ? | 12:32 |
| jelmer | achiang: its UI is a bit clunky, and there there are some open issues around how it rewrites branches | 12:34 |
| achiang | mmm... | 12:34 |
| achiang | now that i've discovered that -r 1 is my bad commit, perhaps i should restate my question/problem: how might i clone a bzr branch with everything *but* the first commit? | 12:36 |
| achiang | or Nth, commit, since in reality, i want everything from -r 4 onward | 12:36 |
| jelmer | achiang: there isn't really a way to do that | 12:37 |
| jelmer | you can do a lightweight checkout or a stacked branch to work around it | 12:38 |
| jelmer | the revision will still be in your history, it just won't be pulled down to your local disk | 12:38 |
| achiang | maybe i'll just experiment with rewrite for a bit and see how far it gets me | 12:38 |
| beuno | o/ jelmer | 12:45 |
| jelmer | hey beuno! | 12:45 |
| achiang | jelmer: so briefly, what would the syntax of bzr rebase be here? i'm trying to grok the help you wrote but it's not clicking. | 12:45 |
| jelmer | beuno: long time no see - how are things? | 12:45 |
| jelmer | achiang: you probably want something like run "bzr replay -r2..-1 /path/to/original/branch" from a newly inited branch | 12:46 |
| achiang | jelmer: will things get screwed up if i'm inside a repo? | 12:47 |
| beuno | jelmer, things are good! busy busy busy, so that doesn't seem to change over time :) You? I heard rumours you moved to London voluntarily | 12:47 |
| jelmer | achiang: no, it will not change any existing revisions - just add new ones | 12:48 |
| achiang | jelmer: ok, thanks. i'll give it a shot | 12:48 |
| jelmer | beuno: :) What are you hacking on these days? | 12:48 |
| jelmer | beuno: I did indeed, working very close to the old C offices :) | 12:48 |
| beuno | jelmer, as good of a view? I'm doing a bit of everything nowadays, but the Ubuntu click appstore is probably the most exciting one | 12:49 |
| jelmer | beuno: It's pretty much impossible to beat that view. :-) | 12:50 |
| jelmer | beuno: Cool - that's the mobile side of things? | 12:50 |
| beuno | jelmer, well, it's the future of everything! but currently works best on phones and tablets, yes | 12:51 |
| ychaouche | Hello ! | 17:54 |
| ychaouche | Is there a way to search in log messages ? | 17:54 |
| jelmer | ychaouche: yes, bzr-search | 17:54 |
| ychaouche | thanks jelmer | 17:54 |
| === zyga_ is now known as zyga-remote | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!