From: Sitaram Chamarty <sitaramc@gmail.com>
Date: Thu, 19 Feb 2009 14:25:30 GMT
Subject: Re: merge smart enough to adapt to renames?
Message-ID: <slrngpqquq.j03.sitaramc@sitaramc.homelinux.net>
In-Reply-To: <81bfc67a0902182212h578e677ck6029c56cb86f7bce@mail.gmail.com>

On 2009-02-19, Caleb Cushing <xenoterracide@gmail.com> wrote:
> branch gentoo.org has a file profiles/package.mask
>
> the software that uses this supports having this be a directory as well.
>
> I'm thinking of mv-ing this file in branch regen2.org to
> profiles/package.mask/gentoo.org
>
> since I can't change the location in gentoo.org (for mostly
> non-technical reasons) when I run git merge gentoo.org from regen2.org
> will git be smart enough to try to merge an updated
> profiles/package.mask into profiles/package.mask/gentoo.org in the
> future?

Yes.  I maintain two copies of something (in different
repos) like this...