{"thread":{"id":"12807","subject":"Rebasing a complete revision graph","startedAt":"2008-03-22T12:19:55Z","lastAt":"2008-03-22T13:50:28Z","messageCount":2,"participants":["Sven Marnach"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"72655","messageId":"20080322121954.GA5578@pantoffel-wg.de","threadId":"12807","inReplyTo":null,"subject":"Rebasing a complete revision graph","fromName":"Sven Marnach","fromEmail":"sven@pantoffel-wg.de","sentAt":"2008-03-22T12:19:55Z","receivedAt":"2008-03-22T12:19:55Z","isPatch":false,"sender":{"key":"sven@pantoffel-wg.de","avatar":null},"body":"Hi,\n\nI'm wondering if there is a way of rebasing a wohle revision graph\nwith multiple branches and merges, but I didn't find anything in the\ndocumentation or on the mailing list.\n\nMy use case is as follows: I imported an svn repository to git using\ngit-svn, but threw away all svn metadata because I just wanted a\none-shot import.  Now I changed my mind and I would like to use \"git\nsvn dcommit\" to push the master branch commits to that old svn\nrepository stil lying around.  There were no changes to that\nrepository meanwhile, and I'm the only one committing to the git\nrepository.\n\nSo my idea is to reimport the svn repository with git-svn, this time\npreserving metadata, and rebasing all the branches in my old git\nrepository on that new import.  (I don't care about all the commits\nbeing rewritten.)  Doing this manually is a big mess, because you have\nto do it for every branch and you have to decide each time onto which\ncommit the branch should be rebased.  If the graph is more complex, it\nseems completely impossible to me to do this using git-rebase.\nMoreover, all tags must be moved manually to the new repository.\n\nIs there some automated way to to this?\n\n(I'm not on the list, please reply directly to me.)\n\nGreetings and thanks,\n    Sven\n"},{"id":"72660","messageId":"20080322135027.GB5578@pantoffel-wg.de","threadId":"12807","inReplyTo":"20080322121954.GA5578@pantoffel-wg.de","subject":"Re: Rebasing a complete revision graph","fromName":"Sven Marnach","fromEmail":"sven@pantoffel-wg.de","sentAt":"2008-03-22T13:50:28Z","receivedAt":"2008-03-22T13:50:28Z","isPatch":false,"sender":{"key":"sven@pantoffel-wg.de","avatar":null},"body":"Hi again,\n\nSven Marnach schrieb am Sa, 22. Mär 2008, um 13:19:54 +0100:\n> I'm wondering if there is a way of rebasing a wohle revision graph\n> with multiple branches and merges, but I didn't find anything in the\n> documentation or on the mailing list.\n\nI finally figured out this can be done using grafts and optionally\nusing git-filter-branch afterwards.\n\nGreetings,\n    Sven\n"}]}