This is the mail archive of the
gcc@gcc.gnu.org
mailing list for the GCC project.
Re: Git mirror changes
- From: Jonathan Wakely <jwakely dot gcc at gmail dot com>
- To: Jason Merrill <jason at redhat dot com>
- Cc: Basile Starynkevitch <basile at starynkevitch dot net>, GCC <gcc at gcc dot gnu dot org>
- Date: Wed, 7 Aug 2013 00:56:38 +0100
- Subject: Re: Git mirror changes
- References: <51ED9890 dot 2080604 at redhat dot com>
On 22 July 2013 21:39, Jason Merrill wrote:
> I'd like to make some changes to the GCC git-svn mirror. Specifically, I
> want to move all the SVN branches from remotes/ into heads/ and split the
> subdirectory branches (redhat, google, etc) into the individual branches.
>
> Should I leave the SVN branches as they are in remotes/ as well, for
> backward compatibility with existing users?
>
> Do we want to limit creation of non-personal branches via git?
>
> Any other thoughts?
It might be unrelated, but something has changed in the Git mirror
around July 25th such that origin/master is no longer the same as
origin/trunk:
$ git rev-parse origin/trunk
775a7983ddd36f65cee7f54e23ff45da0ad106b5
$ git rev-parse origin/master
1f6ad59d8ba56b21e8f5dedb6d3792e1424962a1
The branches have the same content, but diverge after commit 149a90
$ git merge-base origin/trunk origin/master
149a90068641f143967c39dd3f3107dc6a7c8786
Was that caused by moving these branches and was it expected?
Now that I've figured out why 'git pull' and 'git svn rebase' kept
giving me different content I can easily change my upstream to
origin/trunk, but it had me confused for a while!