| === jamesh_ is now known as jamesh | ||
| === marcoceppi_ is now known as marcoceppi | ||
| === abentley is now known as abentley-lunch | ||
| mnn | Hey, everyone. I haven't noticed that 2.6 is out. What does that exactly mean? Bazaar development got really sluggish over past year. | 16:31 |
|---|---|---|
| mnn | jelmer? | 16:33 |
| mgz | haven't noticed? | 16:35 |
| mnn | nope... actually I was considering to move to Git, because of lack of development on bazaar. With that in mind, I would like to have a transitioning period - use bzr with some Git server to store repos | 16:38 |
| mnn | so what's the status of using bazaar with git? | 17:00 |
| mnn | anyone? | 17:00 |
| === abentley-lunch is now known as abentley | ||
| jelmer | mnn: hi | 17:07 |
| jelmer | mnn: you can use bzr on git repositories; there are a few known issues, and bzr-git hasn't been updated to work with some of the newer git features such as signed tags | 17:09 |
| mnn | thanks, jelmer... I've read somewhere that dpushing using bzr-git does not preserve renames... is that still true? | 17:17 |
| jelmer | mnn: yes, dpush is lossy | 17:21 |
| jelmer | mnn: dpush is mainly useful if you want to contribute to an external project that is maintained in git | 17:23 |
| mnn | so if I'm working on personal project, you don't recommend mixing bazaar and git, right? :) | 17:35 |
| jelmer | mnn: indeed; I'd recommend either staying with bazaar or migrating to git | 17:36 |
| jelmer | I was working towards getting bzr-git to support git as just another format in bzr, but never finished that work | 17:37 |
| mnn | too bad... nevertheless thanks for info, jelmer | 17:46 |
| mnn | what about bazaar development itself? 2.6.0 version was released... was this just "formal" release (not to stall any improvements/fixes in 2.6 betas) and development itself will linger as it has for more than a year? | 17:48 |
| jelmer | mnn: Canonical doesn't have any full-time staff on bzr anymore. It's hard to say in a FOSS project how much will happen - it depends on how much time individual contributors want to put in. | 17:50 |
| mnn | so it's safe to say that Canonical "killed" Bazaar, right? | 17:59 |
| jelmer | mnn: I'm not sure that's fair. They're no longer investing in it while they previously were. A lot of the non-Canonical contributors that were around previously also aren't contributing as much. | 18:02 |
| mnn | I know it's not fair. But since rise of Git, bazaar wasn't doing very well, right? Canonical was behind bazaar and Torvalds "was" behind Git. Thus since Canonical does not directly support development of bazaar, bazaar probably will never be able catch up with Git with only external contributors | 18:05 |
| mnn | anyway, what would you recommend, jelmer, as experienced VCS user/developer for bazaar user... moving to Mercurial or Git? | 18:08 |
| smw_ | hi all, I have a bzr repo and I want to push it to a new git repo, is that possible? On a new github repo, I am attempting to do bzr dpush git+ssh://git@github.com/user/repo.git but I get bzr: ERROR: Unsupported protocol for url "git+ssh://git@github.com/user/repo.git" | 19:16 |
| LeoNerd | smw_: I remember having to do something about URL,branch=master | 19:26 |
| LeoNerd | Otherwise it doesn't know what branch name to push to | 19:26 |
| LeoNerd | Certainly I have managed bzr dpush git+ss://git@github.com/Foo/Bar.git,branch=master | 19:27 |
| smw_ | LeoNerd, still isn't working | 19:48 |
| smw_ | LeoNerd, I am trying to dpush to a new repo though, perhaps that is the problem | 19:48 |
| LeoNerd | Ahh.. possibly. I don't imagine it can create them | 19:49 |
| smw_ | LeoNerd, I tried creating a repo with a single commit and doing it | 19:49 |
| smw_ | LeoNerd, still didn't work | 19:49 |
| LeoNerd | Ah.. notsure then.. I know very little about it :/ | 19:50 |
| smw_ | LeoNerd, np, can you help with something else though? I have a "pending merge", how do I execute it? | 19:50 |
| smw_ | LeoNerd, I merged a patch I created with bzrsend | 19:51 |
| LeoNerd | commit. "pending merge" means that there is merge information waiting for the next commit | 19:51 |
| smw_ | ah, so I just need to commit? | 19:51 |
| smw_ | should I put a commit message when I do that? | 19:51 |
| LeoNerd | commits need a message, yes | 19:52 |
| LeoNerd | Lacking anything else I usually just put bzr ci -m "Merged from URL -r REVNO" | 19:52 |
| smw_ | ok | 19:52 |
| smw_ | just committed, now I see it used the wrong email, got to figure out uncommit now :-\ | 19:53 |
| LeoNerd | Hah.. uncommit on git? Good luck :/ | 19:53 |
| smw_ | oh wow, it is just bzr uncommit... that is awesome | 19:53 |
| smw_ | nope, this is on bzr :-D | 19:54 |
| LeoNerd | bzr uncommit will do it locally | 19:54 |
| LeoNerd | ah.. OK :) | 19:54 |
| jelmer | smw_: you need to install bzr-git if you want to push to git | 20:20 |
| smw_ | jelmer, yeah, just figured that out | 20:24 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!