| === FourDoll1rs is now known as FourDollars | ||
| === jpds is now known as Guest46086 | ||
| === quicksil1er is now known as quicksilver | ||
| === milleja46_ is now known as milleja46 | ||
| === vednis is now known as Guest75277 | ||
| === yofel_ is now known as Guest48668 | ||
| === Guest48668 is now known as yofel | ||
| === thomi_ is now known as thomi | ||
| pmatulis | say i do a 'bzr branch lp:whatever'; then 'bzr merge lp:~jdoe/whatever/review1'; and then jdoe does more work before i merge his work into trunk (the 'whatever' project). how do i avoid having to include a commit for the original merge? i'd rather just have a single commit | 19:56 |
|---|---|---|
| === vednis is now known as Guest31918 | ||
| === yofel is now known as Guest395 | ||
| === DarrenS is now known as Guest18637 | ||
| === Guest395 is now known as yofel | ||
| eridu | is there a way to tell git-import to use the development-subtree repo format? I want to import a repo with submodules. | 20:22 |
| jelmer | eridu: nested trees aren't really supported yet - bzr-git supports them, but bzr itself does not | 20:25 |
| eridu | jelmer: I'm aware of this and assume all risks related to using nested trees -- I understand they will blow up in my face, shoot my dog, and when I least expect it, destroy all that I love and hold dear | 20:26 |
| jelmer | you can sort of force the combination to work by initializing the target repo before running git-import | 20:26 |
| jelmer | bzr init-repo --development-subtree foo | 20:26 |
| eridu | can you git-import over an existing repo? | 20:26 |
| jelmer | bzr git-import /url/for/git-repo foo | 20:27 |
| jelmer | eridu: yes | 20:27 |
| eridu | jelmer: thanks! didn't know that | 20:27 |
| fullermd | The trick is to constantly expect your dog to be shot. Then you're safe. | 20:28 |
| === iBasic is now known as BasicOSX | ||
| eridu | hah, that made bazaar crash | 20:35 |
| eridu | I expected my dog to be shot, but not that quickly | 20:35 |
| === wedgwood is now known as Guest90326 | ||
| === Guest90326 is now known as wedgwood | ||
| === verterok` is now known as verterok | ||
| === elmo_ is now known as elmo | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!