| ao2 | Hi, I come from a git background and I am trying to find the equivalent of the "git format-patch" and "git am" commands, to share multiple commits (along with author, date, and full commit messages) via email. | 13:32 |
|---|---|---|
| LeoNerd | I believe what you want is a bundle | 13:32 |
| LeoNerd | $ bzr help bundle | 13:33 |
| ao2 | I see I can use "bzr send -o my.patch" to create a merge directinve which contains a bundle with the info I want to communicate, as confirmed by "bzr bundle-info -v my.patch" | 13:33 |
| ao2 | LeoNerd, I do not understand how I can merge such info from a bundle into a distict repository, "bzr merge" + "bzr commit" results in all changes from the different revisions in the bundle squashed together, and with no commit messages | 13:34 |
| ao2 | I meant "bzr merge my.patch" | 13:35 |
| LeoNerd | Ah; the merge is one commit, but it does retain the distinct identity of the individual changes within that | 13:35 |
| ao2 | so there's no way to rebuild the history of the individual revisions from a bundle? | 13:36 |
| LeoNerd | Define "rebuild"? | 13:36 |
| LeoNerd | Do you want them all visible as separate *mainline* commits? | 13:37 |
| LeoNerd | Usually a merge appears as one commit with multiple sub-commits inside it | 13:37 |
| ao2 | I am with Bazaar (bzr) 2.8.0dev1 BTW. | 13:38 |
| ao2 | rather than rebuild I meant "preserve" the way I added the commits on the local branch | 13:39 |
| LeoNerd | So each one is individual at toplevel? | 13:40 |
| ao2 | yes, and there is also the issue of keeping the commit message[s] from the bundle | 13:41 |
| LeoNerd | Should be doable.. I would imagine some variant of 'bzr replay' can do it | 13:41 |
| LeoNerd | Though offhand not a thing I've fiddled with before | 13:41 |
| ao2 | LeoNerd, let me read about that, thanks for the hint | 13:42 |
| LeoNerd | (replay is useful for pulling commits around places) | 13:42 |
| ao2 | "bzr help replay" fails here, is it an extensions? | 13:43 |
| LeoNerd | Oh.. hmm.. maybe | 13:43 |
| LeoNerd | Personally, I basically never use the email bundle things... those rare times I need to send or receive commits, it's far easier to just have some http-visible repository somewhere | 13:46 |
| ao2 | LeoNerd, it'd be handy for a one-off contribution, and it is a familiar workflow for git people. | 13:50 |
| LeoNerd | Ohright; I'm sure people do it, I'm just saying *I* don't so I'm not sure how helpful I can be in describing it | 13:51 |
| ao2 | LeoNerd, np :) | 13:54 |
| ao2 | and thanks | 13:54 |
| fullermd | I'm not sure peopole do it, they just merge. | 13:59 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!