On Sun, 2010-02-07 at 12:32 -0800, Gabriel Burt wrote: > Ok, I've figured it out: > > Merging an external Subversion repo into an existing git repo. > > In this example, I'm moving the Mirage extension into the > banshee-community-extensions repo. The svn repo has files that > conflict with the git repo, and we really want it to become a subdir > in the git repo anyway. So, we check it out with git-svn (as a branch > within the git repo), then we move its files to the subdir, then we > merge it into master. > > # Fetch and branch the svn repo, within the existing git repo > git-svn init https://svn.hop.at/repos/mirage/ > git-svn fetch A small addition here : you might want to create a text file to properly map the committer identification from svn to git, containing one line per svn id. For example : bertrand = Bertrand Lorentz <bertrand lorentz gmail com> bertrand.lorentz = Bertrand Lorentz <bertrand lorentz gmail com> Then tell banshee to use this file during the "fetch" phase : git-svn --authors-file=../svn_authors.txt fetch > git branch mirage git-svn > git checkout mirage > git clean -fdx > > # Copy its files to a non-conflicting subdirectory (the .copy step is > to avoid issues with git mv *) > mkdir .copy > git mv * .copy/ > mkdir -p src/Mirage > git mv .copy/* src/Mirage/ > git commit -m "[mirage] Move all files to src/Mirage" > > # Merge the resulting branch into master now that it doesn't conflict > git checkout master > git merge mirage > git branch -d mirage > # delete the svn-remote section by hand > vi .git/config > > Good luck! > > Gabriel > > On Sun, Feb 7, 2010 at 11:42 AM, Gabriel Burt <gabriel burt gmail com> wrote: > > Great, I've given you commit access to the repo. I think you can use > > git-svn to convert the svn repo into a git repo, but I'm not positive > > the steps needed to then graft that onto the > > banshee-community-extensions repo. I'll try doing it for Mirage now, > > and let you know if I figure it out. > > > > Gabriel > > > > On Sat, Feb 6, 2010 at 8:44 AM, Mathijs Dumon <mathijsken hotmail com> wrote: > >> Great to here about all this progress, > >> I've just signed-up on gitourious, and I'll need to get ClutterFlow from > >> sourceforge's svn to the gitourious' git as well, so keep me up-to date if > >> you have some news about how to do this, I'm quite new to revisioning. > >> > >> cheers, > >> Mathijs > >> > >>> From: bertrand lorentz gmail com > >>> To: banshee-list gnome org > >>> Date: Thu, 4 Feb 2010 18:03:27 +0100 > >>> Subject: Re: [Banshee-List] Combining Unofficial Banshee Extensions [was: > >>> List of third party extensions on the website] > >>> > >>> On Wed, 2010-02-03 at 19:48 -0800, Gabriel Burt wrote: > >>> > On Sun, Jan 31, 2010 at 1:26 PM, Bertrand Lorentz > >>> > <bertrand lorentz gmail com> wrote: > >>> > > If feedback is positive, I'll try to start working on setting up the > >>> > > project on gitorious at the end of this week : basic structure and > >>> > > build > >>> > > system, using my Alarm Clock extension as a guinea pig. If you want to > >>> > > help out, ping me ! > >>> > > >>> > Ah, I see you've already made > >>> > http://gitorious.org/banshee-community-extensions - can you add > >>> > everybody from the +banshee group to the +banshee-community-extensions > >>> > admin group? > >>> > >>> Done. > >>> > >>> I've also committed the initial directory structure, along with a basic > >>> autotools build system. Still a lot to be done. > >>> > >>> Next step is to add the Alarm Clock extension. I'm currently looking > >>> into importing the history from a SVN subdirectory into a directory in > >>> the git repo, if it's even possible at all... > >>> > >>> -- > >>> Bertrand Lorentz <bertrand lorentz gmail com> > >>> > http://bl-log.blogspot.com < > >> > >> ________________________________ > >> Tijd voor een nieuwe telefoon? Bekijk de mogelijkheden van een Windows > >> Phone! > >> _______________________________________________ > >> banshee-list mailing list > >> banshee-list gnome org > >> http://mail.gnome.org/mailman/listinfo/banshee-list > >> > >> > > > _______________________________________________ > banshee-list mailing list > banshee-list gnome org > http://mail.gnome.org/mailman/listinfo/banshee-list -- Bertrand Lorentz <bertrand lorentz gmail com> > http://bl-log.blogspot.com <
Attachment:
signature.asc
Description: This is a digitally signed message part