From: Kris Shannon <kris@shannon.id.au>
Date: Sat, 21 Feb 2009 04:48:01 GMT
Subject: Re: merge smart enough to adapt to renames?
Message-ID: <e51f4f550902202048g9a210f0t8fefaee4d8376f6c@mail.gmail.com>
In-Reply-To: <499E5A9C.6090900@dawes.za.net>

Rogan Dawes wrote:
> It seems to me that git is smart enough to figure out where contents get
> moved to, once. Of course, if you have conflicting moves in the same
> repo, git's automation falls down. So, if you need to move the "same"
> file in different repositories to different places, you need to do it
> via an intermediate repo that will be able to "remember" which movement
> you chose.

You don't need a whole different repo,  branches are good enough.

git checkout gentoo-integration
git pull gentoo

git checkout sunrise-integration
git pull sunrise

git checkout master
git merge gentoo
git merge sunrise

The integration branches can remember your local changes to
the remotes (like the move of packages.mask)