If you didn't have any problems running git-bzr-ng, you didn't see the bug. This is the patch in question: http://bazaar.launchpad.net/~agrimm/bzr-fastimport/baseline-commit/revision/342
The simple way to check it is to look at SHA values for commits that should be shared with trunk, or just try merging from git master and see what happens. In this case, these two commits have the same SHA so that means it worked: https://github.com/mixxxdj/mixxx/commit/be12963e66b96ecad52b42598157e1adae4ba48a https://github.com/daschuer/mixxx/commit/be12963e66b96ecad52b42598157e1adae4ba48a On Fri, 2013-06-14 at 07:59 +0200, Daniel Schürmann wrote: > Arrg .. :-/ > > > What is the bug about? I have yesterday cleaned up Scotts branch. > > > @Owen: It looks like a success, But can you have a look? > https://github.com/daschuer/mixxx/tree/advanced_autodj_2 > > > Thank you > > > Daniel > > > > 2013/6/13 Owen Williams <owilli...@mixxx.org> > also note that I had to hand-patch git-bzr-ng due to a bug. > It's much > easier if you let me do the conversion :). > > Owen > > On Thu, 2013-06-13 at 15:21 -0400, RJ Ryan wrote: > > > > > > > > On Thu, Jun 13, 2013 at 1:50 AM, Daniel Schürmann > <dasch...@mixxx.org> > > wrote: > > Hi RJ > > > > >> If I understand it right, git has user > credentials per > > repository while bzr has it per branch, we should > deal with > > it. > > > > > > > Credentials aren't built into git -- if you have > write > > access to the repo then you can write to it. So > GitHub is in > > charge > > > of credentials here. You can configure other > people to have > > push access to your repos I believe. What did you > have in > > mind? > > > > > > Nothing special, I was just wondering what will > happen with > > all the private branches on Launchpad. As Owen > pointed out, > > making them all public in a common community > repository is not > > the best way but make it public on demand is fine. > > > > > > > > > > > > It could be also useful to have a description how to > put a > > private bzr branch into a private git repository > without > > losing track. > > Currently we have > 100 bzr branches public but I > believe > > there must bealso a huge number of non public > branches on > > the contributors machines. > > > > > > > > > > Hm, do you mean private as in they don't want to share their > changes > > or private as in ACL'd to the owner? > > > > > > If you want Owen to convert your branch the latest version > should be > > pushed to lp:~yourusername/mixxx/branch. It will show up in > > http://github.com/mixxxcommunity/mixxx as a branch there. > From there > > all you need to do is copy it to your personal repository > e.g. > > http://github.com/yourusername/mixxx and continue working on > it. > > > > > > For example lp:~max-linke/mixxx/qsettings > > became > https://github.com/mixxxcommunity/mixxx/tree/max-linke-qsettings > > > > > > If it's a private branch in the sense you don't want to > share your > > changes with the world then you can use Owen's script to > convert it > > yourself (though it needs some work before it will work for > other > > people). Then you can manually add GitHub as a remote to > your local > > git repository with the private (not pushed to github) > branches. > > There's no reason it won't work this way but I don't think > there are > > many people out there who are developing brances they don't > want the > > world to see (maybe someone is weaponizing the Mixxx source > code for > > the US military?). > > > > > > > > Did we actually lose track, if we just use > git-bzr-ng? > > > > > > Yes, if you just use git-bzr-ng yourself without Owen's > script the > > resulting Git repository will not work with > > http://github.com/mixxxdj/mixxx. This is because of the > author name > > rewriting. > > > > > > > > > > Kind regards, > > > > > > Daniel > > > > > > > > > > > > > > 2013/6/13 RJ Ryan <rr...@mixxx.org> > > > > > > > > On Wed, Jun 12, 2013 at 6:45 PM, Daniel > Schürmann > > <dasch...@mixxx.org> wrote: > > Hi RJ, > > > > > > Fine news! > > > > Mixxx has 122 active Launchpad > branches. Does > > it really make sense to convert all > of them to > > git? In which condition is the Owens > > converter? Is it possible to provide > it, so > > that we can convert branches when > required by > > ourselves? > > > > > > > > He could probably do that. Owen? > > > > > > > > The normal git workflow is to clone > the > > repository and then maintain private > branches > > inside the cloned repository. It > would be nice > > to have a way to put the private bzr > branches > > into the private Git clone. > > > > > > > > > > This is something you'll have to do on your > own. If we > > go the mixxxcommunity/mixxx route you could > pull the > > specific branches you wanted to recover from > > mixxxcommunity/mixxx into your personal > repo. > > > > > > If I understand it right, git has > user > > credentials per repository while bzr > has it > > per branch, we should deal with it. > > > > > > > > > > Credentials aren't built into git -- if you > have write > > access to the repo then you can write to it. > So GitHub > > is in charge of credentials here. You can > configure > > other people to have push access to your > repos I > > believe. What did you have in mind? > > > > -- > > > > > > How is the solution for the bug > references? Is > > there a special trick or should put > them into > > the commit message only? > > > > > > > > > > Unfortunately there's no LP bug / commit > interop here. > > I say we just continue to mention bugs (Bug > #123456) > > in commit messages. > > > > > > RJ > > > > > > > > > > > > Kind regards, > > > > > > Daniel > > > > > > > > > > > > > > 2013/6/12 RJ Ryan <rr...@mixxx.org> > > Hi all, > > > > > > Just wanted to give a status > update on > > the Git migration. We're > almost done! > > > > > > > https://github.com/mixxxdj/mixxx > > > > > > tl:dr -- stop committing to > Launchpad. > > Make a GitHub account and > fork the > > Mixxx repo. Push changes and > personal > > branches to your forks and > make pull > > requests to get them merged > into the > > master Mixxx branch. > > > > > > We've been using GitHub to > discuss a > > few recent branch merges and > the > > result has been outstanding. > It is > > much easier to discuss and > review > > branch merge proposals. The > number of > > comments the recent merges > have > > received has far outpaced > the comments > > merge proposals on Launchpad > > received. > > > > > > * Build system / Build > server > > > > > > The build system and build > server now > > produces packages using Git. > > > > > > * Website > > > > > > Some references to Bazaar > need to be > > updated. > > > > > > * Wiki > > > > > > I've updated various pages > on the wiki > > to remove non-historical > references to > > Bazaar from the wiki. The > compilation > > instructions (though not > tested) are > > updated and we have a new > Using Git > > article: > http://mixxx.org/wiki/doku.php/using_git > > > > > > * Branch migration, author > rewrites > > > > > > Owen has whipped up a quite > fancy > > branch migration system that > > automatically does the > author > > rewriting we discussed > previously. > > Unfortunately, due to author > rewriting > > you cannot convert your > branch > > yourself using git-bzr-ng or > a similar > > tool! > > > > > > We are going to copy every > branch on > > > http://code.launchpad.net/mixxx to > > GitHub but we are still > figuring out > > where they should go. I > think they > > will clutter up the > mixxxdj/mixxx > > branch list so we may create > a > > mixxxcommunity/mixxx repo to > put them > > all in. You will have to > clone that > > repo to get your branch. > We'll > > announce details once Owen > decides how > > to do it. > > > > > > Please clone the Mixxx > GitHub repo and > > give it a try. If you have > never used > > Git before, there are tons > of great > > resources for learning out > there. I've > > linked some of them at the > bottom > > of > http://mixxx.org/wiki/doku.php/using_git > > > > > > Please stop committing to > Bazaar and > > push all of your latest > changes to > > Bazaar branches you would > like > > converted. Contact either > Owen or I if > > you have any problems. > > > > > > Also, please help me in > updating out > > of date or wrong information > about > > Bzr / Git on the wiki. If > you find the > > compilation instructions are > not > > working, please update them. > > > > > > This would not have happened > if Owen > > hadn't stepped up to take > charge of > > the migration. Thanks Owen! > > > > > > Best regards, > > RJ > > > > > > > > > > ------------------------------------------------------------------------------ > > This SF.net email is > sponsored by > > Windows: > > > > Build for Windows Store. > > > > > http://p.sf.net/sfu/windows-dev2dev > > > _______________________________________________ > > Get Mixxx, the #1 Free MP3 > DJ Mixing > > software Today > > http://mixxx.org > > > > > > Mixxx-devel mailing list > > > Mixxx-devel@lists.sourceforge.net > > > https://lists.sourceforge.net/lists/listinfo/mixxx-devel > > > > > > > > > > > > > > > > > > > > > > > ------------------------------------------------------------------------------ This SF.net email is sponsored by Windows: Build for Windows Store. http://p.sf.net/sfu/windows-dev2dev _______________________________________________ Get Mixxx, the #1 Free MP3 DJ Mixing software Today http://mixxx.org Mixxx-devel mailing list Mixxx-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mixxx-devel
