| greggypoo | ok here's the workflow i'm aiming for. i check out a bzr project from launchpad, branch it to make my changes, and then start hacking on my extensive set of changes.. | 00:48 |
|---|---|---|
| greggypoo | after commiting several changes, i discover an unrelated bug, so i fix it, and that is its own commit | 00:48 |
| greggypoo | what is the proper way to make a "pull request" or what-have-you to ask upstream to incorporate my bugfix but not worry about my other changes yet? | 00:49 |
| SamB_ | greggypoo: can you do that in git either? | 00:49 |
| greggypoo | it's trivial in git but i have no idea how it is done in practice, i'm a total newbie to github for example | 00:50 |
| greggypoo | if i had to dance around upstream requirements in git, i would just make yet another branch and cherry-pick my bugfix into it | 00:52 |
| greggypoo | i keep thinking i must fundamentally not understand bzr, because i think that making a new branch in bzr is expensive | 00:52 |
| lifeless | greggypoo: you put it in its own branch; making a branch is cheap. | 01:03 |
| lifeless | greggypoo: however you need to either be using bzr-colo or have setup a shared repo for yourself locally. | 01:03 |
| lifeless | for it to be ultra cheap | 01:03 |
| greggypoo | when i made my first branch, it copied 400MB of history. i think "shared repo" is probably what i needed to hear, though. | 01:04 |
| greggypoo | thanks | 01:04 |
| greggypoo | thanks again - shared repository truly does answer the vast majority of my complaints with bzr | 03:06 |
| mgrandi | <3 | 03:13 |
| greggypoo | ok, i can live without this, but...is there anything like "git add -p" ? it shows you the diffs one at a time, and asks if you want to make it part of the next commit | 03:25 |
| mgrandi | there is sort of something like that | 03:26 |
| mgrandi | there is bzr qshelve that will show the hunks | 03:27 |
| mgrandi | and then you can 'shelve them' if you dont want to commit them at this moment | 03:27 |
| mgrandi | there is probably something similiar in command line form | 03:27 |
| mgrandi | or a plugin | 03:27 |
| greggypoo | thanks, bzr qshelve makes sense...i've been using regular shelve as a stopgap | 03:28 |
| mgrandi | its the same thing as git (more or less since bzr doesn't have the 'index') | 03:29 |
| mgrandi | it would be nice to have a plugin do it for you using shelve | 03:29 |
| mgrandi | (aka shelve temporarily -> commit your selected changes -> unshelve) | 03:29 |
| mgrandi | bzr help shelf1 | 03:29 |
| mgrandi | whoops | 03:29 |
| mgrandi | i have 'shelve1' (from a plugin | 03:31 |
| mgrandi | it seems to have an interactive mode | 03:31 |
| greggypoo | ok, and hopefully the last one :) how do branches ever get deleted? i have pushed an lp:~myusername/project/branchname ..does that branch just magically disappear once the "proposed merge" is accepted? | 03:33 |
| mgrandi | they dont get deleted unless you delete them, but if they are merged then you can delete them since the changes are present in the branch that you merged into | 03:34 |
| mgrandi | (on launchpad) | 03:34 |
| greggypoo | locally I used rm -rf to delete an unneeded branch, how would i delete it remotely on launchpad? | 03:35 |
| mgrandi | i would presume through the website somewhere | 03:35 |
| greggypoo | ok thanks :) | 03:35 |
| mgrandi | alternatively you don't have to delete it as it would take up very little space, since it shares the commits with the merged branch | 03:35 |
| greggypoo | yup, just didn't see it on the first glance, it was on my screen :) | 03:36 |
| greggypoo | i just didn't want to be the guy that cluttered up the project view on launchpad | 03:36 |
| mgrandi | im not exactly sure how lp works, i think branches of a project that you don't own go into your own directory | 03:38 |
| mgrandi | like launchpad.net/~markgrandi/bzr/something | 03:39 |
| greggypoo | yeah, it puts my name on it, but there's a view that shows all of the personal branches together | 03:39 |
| mgrandi | ah | 03:40 |
| mgrandi | i wouldn't worry too much about that, even github has that to an extent =P | 03:40 |
| greggypoo | everything i know about git i learned on my private server, so it is a little bit of a learning curve to try not to look like an idiot when submitting things on github or launchpad | 03:41 |
| mgrandi | they are more or less the same | 03:42 |
| === mmrazik is now known as mmrazik|lunch | ||
| === mmrazik|lunch is now known as mmrazik | ||
| === wedgwood_away is now known as wedgwood | ||
| === mmrazik is now known as mmrazik|afk | ||
| === mmrazik|afk is now known as mmrazik | ||
| === mmrazik is now known as mmrazik|afk | ||
| === wedgwood is now known as wedgwood_away | ||
| === wedgwood_away is now known as wedgwood | ||
| === wedgwood is now known as wedgwood_away | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!