This is the mail archive of the
gcc@gcc.gnu.org
mailing list for the GCC project.
Re: Acceptance criteria for the git conversion
- From: Joseph Myers <joseph at codesourcery dot com>
- To: shmeel gutl <shmeelgutl at shmuelhome dot mine dot nu>
- Cc: <gcc at gcc dot gnu dot org>
- Date: Thu, 3 Sep 2015 11:37:01 +0000
- Subject: Re: Acceptance criteria for the git conversion
- Authentication-results: sourceware.org; auth=none
- References: <20150901105414 dot GA30270 at thyrsus dot com> <55E7F4FE dot 2000805 at shmuelhome dot mine dot nu>
On Thu, 3 Sep 2015, shmeel gutl wrote:
> I am working from a clone of the current git repository. Is there an automated
> procedure that will enable me to switch to the new repository and still keep
> all of the commit history of my local branches?
Well, the "git fetch" command I proposed in
<https://gcc.gnu.org/ml/gcc/2015-09/msg00040.html> could no doubt be
accompanied by commands people can run in their clones to adapt them for
the renaming of refs - that sort of conversion instructions is one of the
things we need anyway before making the switch. Given then that you've
fetched the newly converted history into your clone (which in fact doesn't
depend on having both sets of objects in the one gcc.gnu.org repository),
you can do a "git merge -s ours" from the relevant revision of the new
history (and then do future merges from the new master), or do something
with "git rebase --onto" to create new branches based on the new history
with the commits from your old branches.
--
Joseph S. Myers
joseph@codesourcery.com