Issue running git-svn-mirror script on code
janssens-geert at telenet.be
Wed Jan 23 06:47:32 EST 2013
On 23-01-13 01:43, John Ralls wrote:
> On Jan 22, 2013, at 9:23 AM, John Ralls <jralls at ceridwen.us> wrote:
>> On Jan 22, 2013, at 9:00 AM, Geert Janssens <janssens-geert at telenet.be> wrote:
>>> On 22-01-13 17:41, John Ralls wrote:
>>>> On Jan 22, 2013, at 7:04 AM, Geert Janssens <janssens-geert at telenet.be> wrote:
>>>>> What steps would your recommend to reattach private branches ? With my (limited) git knowledge I would only know how to export (git format-patch) from the old repo and import (git am) in the new clone. Is there a more direct way to do this ?
>>>> Format-patch is the *safest* way, but the following should also work, though I haven't tested it yet:
>>>> Clone the regenerated repo to a new repo (don't delete the old one yet!).
>>>> Create a new branch from the target branch in the new repo.
>>>> In the old repo, rebase the private branch on the head of the target branch (you'll want to do this before running format-patch, too).
>>>> Back in the new repo, git pull the private branch into the new branch you just created. Rebase it onto the head of the target branch.
>>> Interesting approach. Wouldn't this detect the discrepancy in history and try to pull in all these changes ?
>> The pull probably would. I think rebasing will repair that. The "incorrect" changes will then become unreachable and can be removed with git gc.
> Rebasing didn't work, but cherry-picking does. Procedure is on the Git Wiki page.
> John Ralls
> gnucash-devel mailing list
> gnucash-devel at gnucash.org
I have verified the procedure to work. Thanks. I did some very minor
modifications, which I hope clear up some small confusions.
Any suggestion to migrate the stashed stack ?
More information about the gnucash-devel