| === _thumper_ is now known as thumper | ||
| mgz | morning | 06:47 |
|---|---|---|
| mgz | so, silly, error, I didn't take headset with me, so I lack a mic | 06:47 |
| lifeless | lol ;) | 06:50 |
| jelmer | hey mgz, lifeless | 06:50 |
| mgz | can listen on headphones and type, but you'll all miss out on the gurgles from niece | 06:52 |
| jam1 | jelmer: are you around? mgz is available for our standup on mumble | 07:11 |
| === jam1 is now known as jam | ||
| jelmer | jam: I'm on my way | 07:14 |
| jam | mgz: for some reason I still had you listed as a 1:1 today, did you have anything else you wanted to mention? | 08:50 |
| jam | I think I just moved the meeting from the wrong day, and meant to do it next week | 08:51 |
| mgz | jam: nothing important I think | 09:08 |
| jam | I figured everything was already covered. Have a great week | 09:09 |
| === yofel_ is now known as yofel | ||
| === jcsackett_ is now known as jcsackett | ||
| lduros | trunk is the equivalent of "master" in git? :-) | 14:44 |
| LeoNerd | "trunk" is just a naming convention | 14:59 |
| LeoNerd | bzr doesn't consider any branch any more or less canonical than any other. They're just branches | 15:00 |
| lduros | LeoNerd: okie | 15:08 |
| lduros | :-) | 15:08 |
| lduros | it converted my git master branch to trunk | 15:08 |
| lduros | thougbh | 15:08 |
| lduros | it seems | 15:08 |
| lduros | with fast-import | 15:08 |
| LeoNerd | Yeah that's likely just a naming convention | 15:09 |
| lduros | ok | 15:12 |
| lduros | so I just transferred my git repo to bzr | 15:14 |
| lduros | and now I have a directory | 15:14 |
| lduros | and it contains trunk.remote somebranch.remote | 15:15 |
| lduros | I want to remove everything except trunk | 15:15 |
| lduros | shall I just rm -rf them | 15:15 |
| lduros | or is there a bzr way to do it? :-) | 15:15 |
| lduros | can't find in the docs | 15:15 |
| lduros | bzr remove-branch ah | 15:17 |
| maxb | lduros: bzr-git maps master to trunk, because trunk is the more common convention outside of the world of git - but it's still just convention | 20:04 |
| lduros | maxb: sure ok :-) | 20:04 |
| lduros | trunk is fine with me | 20:05 |
| lduros | :-) | 20:05 |
| jelmer | maxb: s/bzr-git/bzr-fastimport/ ? | 20:06 |
| maxb | er, possibly, :-) | 20:07 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!