On 22-01-13 17:41, John Ralls wrote:
On Jan 22, 2013, at 7:04 AM, Geert Janssens <janssens-ge...@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 ?
Can we have the gitolite repo available for a few days to test out procedures
like this before we recreate the Github repo so that we can have good
instructions on the wiki page?
Sure, it's easy to set up read-only access to the gitolite repos either
to anyone or only the devs involved in the conversion.
Geert
_______________________________________________
gnucash-devel mailing list
gnucash-devel@gnucash.org
https://lists.gnucash.org/mailman/listinfo/gnucash-devel